diff --git a/Dockerfile b/Dockerfile
index 16da27b..50cc5e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.21-alpine3.18 AS build
+FROM golang:1.23.0-alpine3.20 AS build
 
 COPY . /ubbagent-src/
 WORKDIR /ubbagent-src/
@@ -21,7 +21,7 @@ RUN apk add --no-cache make git
 RUN rm -rf /ubbagent-src/.git
 RUN make clean setup build
 
-FROM alpine:3.18
+FROM alpine:3.20
 RUN apk add --update libintl ca-certificates && \
     apk add --virtual build_deps gettext && \
     cp /usr/bin/envsubst /usr/local/bin/envsubst && \
diff --git a/WORKSPACE b/WORKSPACE
index 53deeb4..9dc19bf 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -2,26 +2,26 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "6b65cb7917b4d1709f9410ffe00ecf3e160edf674b78c54a894471320862184f",
+    sha256 = "67b4d1f517ba73e0a92eb2f57d821f2ddc21f5bc2bd7a231573f11bd8758192e",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.39.0/rules_go-v0.39.0.zip",
-        "https://github.com/bazelbuild/rules_go/releases/download/v0.39.0/rules_go-v0.39.0.zip",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.50.0/rules_go-v0.50.0.zip",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.50.0/rules_go-v0.50.0.zip",
     ],
 )
 
 # gazelle is used for generating BUILD.bazel files.
 http_archive(
     name = "bazel_gazelle",
-    sha256 = "727f3e4edd96ea20c29e8c2ca9e8d2af724d8c7778e7923a854b2c80952bc405",
+    sha256 = "b760f7fe75173886007f7c2e616a21241208f3d90e8657dc65d36a771e916b6a",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.30.0/bazel-gazelle-v0.30.0.tar.gz",
-        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.30.0/bazel-gazelle-v0.30.0.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.39.1/bazel-gazelle-v0.39.1.tar.gz",
+        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.39.1/bazel-gazelle-v0.39.1.tar.gz",
     ],
 )
 
 load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
 
-go_register_toolchains(version = "1.20.5")
+go_register_toolchains(version = "1.23.0")
 
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
diff --git a/cloudbuild.Dockerfile b/cloudbuild.Dockerfile
deleted file mode 100644
index e42b5f8..0000000
--- a/cloudbuild.Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-# The image has the environment setup for running builds and tests
-# on Google Cloud Build.
-FROM gcr.io/cloud-builders/go:debian-1.21
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends python3-dev
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index d927863..0153802 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -20,8 +20,6 @@ steps:
   - build
   - --tag
   - runtime:local
-  - -f
-  - cloudbuild.Dockerfile
   - '.'
 
 - id: &Test Test