diff --git a/docker/Dockerfile b/docker/Dockerfile
index c0a1f16..1b1f279 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 # Prepare the image with:
 #   docker build -t tensorflow/haskell:v0 docker
-FROM tensorflow/tensorflow:2.3.0
+FROM tensorflow/haskell:2.3.0
 LABEL maintainer="TensorFlow authors <tensorflow-haskell@googlegroups.com>"
 
 RUN apt-get update
diff --git a/stack.yaml b/stack.yaml
index 1eeb681..a169b6c 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-15.11
+resolver: lts-16.18
 
 packages:
 - tensorflow
diff --git a/tensorflow-core-ops/tensorflow-core-ops.cabal b/tensorflow-core-ops/tensorflow-core-ops.cabal
index 497d7a4..1347346 100644
--- a/tensorflow-core-ops/tensorflow-core-ops.cabal
+++ b/tensorflow-core-ops/tensorflow-core-ops.cabal
@@ -16,7 +16,7 @@ library
   exposed-modules:  TensorFlow.GenOps.Core
   autogen-modules:  TensorFlow.GenOps.Core
   build-depends:  bytestring
-                , proto-lens == 0.6.*
+                , proto-lens == 0.7.*
                 , tensorflow == 0.2.*
                 , base >= 4.7 && < 5
                 , lens-family == 2.*
@@ -27,7 +27,7 @@ custom-setup
   setup-depends: Cabal
                 , bytestring
                 , directory
-                , proto-lens == 0.6.*
+                , proto-lens == 0.7.*
                 , tensorflow-opgen == 0.2.*
                 , tensorflow == 0.2.*
                 , base >= 4.7 && < 5
diff --git a/tensorflow-logging/tensorflow-logging.cabal b/tensorflow-logging/tensorflow-logging.cabal
index b79cf98..e3756cc 100644
--- a/tensorflow-logging/tensorflow-logging.cabal
+++ b/tensorflow-logging/tensorflow-logging.cabal
@@ -24,7 +24,7 @@ library
                 , filepath
                 , hostname
                 , lens-family == 2.*
-                , proto-lens == 0.6.*
+                , proto-lens == 0.7.*
                 , resourcet
                 , stm
                 , stm-chans
diff --git a/tensorflow-mnist/tensorflow-mnist.cabal b/tensorflow-mnist/tensorflow-mnist.cabal
index f628140..52f2500 100644
--- a/tensorflow-mnist/tensorflow-mnist.cabal
+++ b/tensorflow-mnist/tensorflow-mnist.cabal
@@ -20,7 +20,7 @@ library
   exposed-modules: TensorFlow.Examples.MNIST.Parse
                 ,  TensorFlow.Examples.MNIST.TrainedGraph
   other-modules:  Paths_tensorflow_mnist
-  build-depends: proto-lens == 0.6.*
+  build-depends: proto-lens == 0.7.*
                 , base >= 4.7 && < 5
                 , binary
                 , bytestring
diff --git a/tensorflow-opgen/tensorflow-opgen.cabal b/tensorflow-opgen/tensorflow-opgen.cabal
index e867121..3223256 100644
--- a/tensorflow-opgen/tensorflow-opgen.cabal
+++ b/tensorflow-opgen/tensorflow-opgen.cabal
@@ -16,7 +16,7 @@ library
   hs-source-dirs:      src
   exposed-modules:     TensorFlow.OpGen.ParsedOp
                      , TensorFlow.OpGen
-  build-depends:  proto-lens == 0.6.*
+  build-depends:  proto-lens == 0.7.*
                 , tensorflow-proto == 0.2.*
                 , base >= 4.7 && < 5
                 , bytestring
diff --git a/tensorflow-ops/tensorflow-ops.cabal b/tensorflow-ops/tensorflow-ops.cabal
index e707ae6..0691ffe 100644
--- a/tensorflow-ops/tensorflow-ops.cabal
+++ b/tensorflow-ops/tensorflow-ops.cabal
@@ -21,7 +21,7 @@ library
                  , TensorFlow.NN
                  , TensorFlow.Queue
                  , TensorFlow.Variable
-  build-depends:  proto-lens == 0.6.*
+  build-depends:  proto-lens == 0.7.*
                 , base >= 4.7 && < 5
                 , bytestring
                 , fgl
diff --git a/tensorflow-proto/tensorflow-proto.cabal b/tensorflow-proto/tensorflow-proto.cabal
index f17122e..3d74db3 100644
--- a/tensorflow-proto/tensorflow-proto.cabal
+++ b/tensorflow-proto/tensorflow-proto.cabal
@@ -189,9 +189,9 @@ library
                      , Proto.Tensorflow.Core.Util.SavedTensorSlice_Fields
                      , Proto.Tensorflow.Core.Util.TestLog
                      , Proto.Tensorflow.Core.Util.TestLog_Fields
-  build-depends:  proto-lens == 0.6.*
-                , proto-lens-runtime == 0.6.*
-                , proto-lens-protobuf-types == 0.6.*
+  build-depends:  proto-lens == 0.7.*
+                , proto-lens-runtime == 0.7.*
+                , proto-lens-protobuf-types == 0.7.*
                 , base >= 4.7 && < 5
   default-language:    Haskell2010
   include-dirs: .
diff --git a/tensorflow/tensorflow.cabal b/tensorflow/tensorflow.cabal
index 0c81268..3f99648 100644
--- a/tensorflow/tensorflow.cabal
+++ b/tensorflow/tensorflow.cabal
@@ -36,7 +36,7 @@ library
                   , TensorFlow.Types
   other-modules:    TensorFlow.Internal.Raw
   build-tools:      c2hs
-  build-depends:  proto-lens == 0.6.*
+  build-depends:  proto-lens == 0.7.*
                 , tensorflow-proto == 0.2.*
                 , base >= 4.7 && < 5
                 , async