diff --git a/chapters/07_production/BUILD b/chapters/07_production/BUILD
index 149088b..faa8536 100644
--- a/chapters/07_production/BUILD
+++ b/chapters/07_production/BUILD
@@ -4,7 +4,7 @@ py_binary(
         "export.py",
     ],
     deps = [
-        "@tf_serving//tensorflow_serving/session_bundle:exporter",
+        "@org_tensorflow//tensorflow/contrib/session_bundle:exporter",
         "@org_tensorflow//tensorflow:tensorflow_py",
         # only needed for inception model export
         "@inception_model//inception",
diff --git a/chapters/07_production/WORKSPACE b/chapters/07_production/WORKSPACE
index 7f98a4d..fb99c5f 100644
--- a/chapters/07_production/WORKSPACE
+++ b/chapters/07_production/WORKSPACE
@@ -2,20 +2,20 @@ workspace(name = "serving")
 
 local_repository(
     name = "tf_serving",
-    path = __workspace_dir__ + "/tf_serving",
+    path = "tf_serving",
 )
 
 local_repository(
     name = "org_tensorflow",
-    path = __workspace_dir__ + "/tf_serving/tensorflow",
+    path = "tf_serving/tensorflow",
 )
 
-load('//tf_serving/tensorflow/tensorflow:workspace.bzl', 'tf_workspace')
-tf_workspace("tf_serving/tensorflow/", "@org_tensorflow")
+load('@org_tensorflow//tensorflow:workspace.bzl', 'tf_workspace')
+tf_workspace()
 
 bind(
     name = "libssl",
-    actual = "@boringssl_git//:ssl",
+    actual = "@boringssl//:ssl",
 )
 
 bind(
@@ -27,5 +27,5 @@ bind(
 
 local_repository(
     name = "inception_model",
-    path = __workspace_dir__ + "/tf_serving/tf_models/inception",
+    path = "tf_serving/tf_models/inception",
 )
diff --git a/chapters/07_production/export.py b/chapters/07_production/export.py
index 257e073..4dd3447 100644
--- a/chapters/07_production/export.py
+++ b/chapters/07_production/export.py
@@ -10,7 +10,7 @@
 import sys
 
 import tensorflow as tf
-from tensorflow_serving.session_bundle import exporter
+from tensorflow.contrib.session_bundle import exporter
 from inception import inception_model
 
 NUM_CLASSES_TO_RETURN = 10
@@ -43,7 +43,7 @@ def inference(images):
     # Restore variables from training checkpoints.
     ckpt = tf.train.get_checkpoint_state(sys.argv[1])
     if ckpt and ckpt.model_checkpoint_path:
-        saver.restore(sess, sys.argv[1] + "/" + ckpt.model_checkpoint_path)
+        saver.restore(sess, ckpt.model_checkpoint_path)
     else:
         print("Checkpoint file not found")
         raise SystemExit