diff --git a/docker-compose.golang.yml b/docker-compose.golang.yml
index c13922f..3137e03 100644
--- a/docker-compose.golang.yml
+++ b/docker-compose.golang.yml
@@ -7,7 +7,15 @@ services:
       context: .
       dockerfile: golang/Dockerfile
       args:
-        VERSION: "1.21"
+        VERSION: "1.22"
+
+  golang1.22:
+    image: okteto/golang:1.22
+    build:
+      context: .
+      dockerfile: golang/Dockerfile
+      args:
+        VERSION: "1.22"
 
   golang1.21:
     image: okteto/golang:1.21
@@ -34,12 +42,3 @@ services:
       args:
         VERSION: "1.19"
         DEBIAN_VERSION: "buster"
-
-  golang1.18:
-    image: okteto/golang:1.18
-    build:
-      context: .
-      dockerfile: golang/Dockerfile
-      args:
-        VERSION: "1.18"
-        DEBIAN_VERSION: "buster"
diff --git a/golang/Dockerfile b/golang/Dockerfile
index 587c578..bc57bb8 100644
--- a/golang/Dockerfile
+++ b/golang/Dockerfile
@@ -1,4 +1,4 @@
-ARG VERSION="1.21"
+ARG VERSION="1.22"
 ARG DEBIAN_VERSION="bookworm"
 FROM golang:${VERSION}-${DEBIAN_VERSION}