diff --git a/dockers/dev/Dockerfile b/dockers/dev/Dockerfile
index f1f0464a0a..6ccedfc882 100644
--- a/dockers/dev/Dockerfile
+++ b/dockers/dev/Dockerfile
@@ -64,15 +64,10 @@ RUN --mount=type=bind,target=.,rw \
     && apt-get update -y \
     && apt-get upgrade -y \
     && apt-get install -y --no-install-recommends --fix-missing \
-    curl \
-    gnupg \
-    software-properties-common \
-    && add-apt-repository ppa:ubuntu-toolchain-r/test -y \
-    && apt-get update -y \
-    && apt-get upgrade -y \
-    && apt-get install -y --no-install-recommends --fix-missing \
     build-essential \
     ca-certificates \
+    curl \
+    gnupg \
     tzdata \
     locales \
     git \
diff --git a/hack/docker/gen/main.go b/hack/docker/gen/main.go
index c619fdc35c..d49c4d2cb2 100644
--- a/hack/docker/gen/main.go
+++ b/hack/docker/gen/main.go
@@ -92,20 +92,12 @@ RUN {{RunMounts .RunMounts}} \
     && apt-get clean \
     && apt-get update -y \
     && apt-get upgrade -y \
-{{- if eq (ContainerName .ContainerType) "%s"}}
-    && apt-get install -y --no-install-recommends --fix-missing \
-    curl \
-    gnupg \
-    software-properties-common \
-    && add-apt-repository ppa:ubuntu-toolchain-r/test -y \
-    && apt-get update -y \
-    && apt-get upgrade -y \
-{{- end}}
     && apt-get install -y --no-install-recommends --fix-missing \
     build-essential \
     ca-certificates \
-{{- if not (eq (ContainerName .ContainerType) "%s")}}
     curl \
+{{- if eq (ContainerName .ContainerType) "%s"}}
+    gnupg \
 {{- end}}
     tzdata \
     locales \
@@ -143,7 +135,6 @@ ENTRYPOINT [{{Entrypoint .Entrypoints}}]
 ENTRYPOINT ["{{.BinDir}}/{{.AppName}}"]
 {{- end}}
 {{- end}}`, DevContainer.String(), CIContainer.String(),
-	DevContainer.String(),
 	DevContainer.String(),
 	DevContainer.String(), CIContainer.String(),
 	DevContainer.String(), CIContainer.String())