diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 4deeec3d..db01acda 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -118,6 +118,7 @@ steps:
           setup:
             makefile:
               - "Makefile"
+              - "Makefile.debian7"
               - "Makefile.debian9"
               - "Makefile.debian10"
               - "Makefile.debian11"
@@ -184,6 +185,7 @@ steps:
           setup:
             makefile:
               - "Makefile"
+              - "Makefile.debian7"
               - "Makefile.debian9"
               - "Makefile.debian10"
               - "Makefile.debian11"
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 6462717e..8e69be58 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -48,6 +48,7 @@ template: |
   - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-base`
   - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-darwin` - darwin/amd64 (MacOS 10.11, MacOS 10.14)
   - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main` - linux/i386, linux/amd64, windows/amd64
+  - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian7` - linux/i386, linux/amd64, windows/amd64
   - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian9` - linux/i386, linux/amd64, windows/amd64
   - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian10` - linux/i386, linux/amd64, windows/amd64
   - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-main-debian11` - linux/i386, linux/amd64, windows/amd64
diff --git a/Makefile b/Makefile
index 17fde875..a1fef7aa 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ build:
 	@echo '0' > ${status}
 	@$(foreach var,$(TARGETS), \
 		$(MAKE) -C $(var) $@ || echo '1' > ${status}; \
+		$(MAKE) -C $(var) -f Makefile.debian7 $@ || echo '1' > ${status}; \
 		$(MAKE) -C $(var) -f Makefile.debian9 $@ || echo '1' > ${status}; \
 		$(MAKE) -C $(var) -f Makefile.debian10 $@ || echo '1' > ${status}; \
 		$(MAKE) -C $(var) -f Makefile.debian11 $@ || echo '1' > ${status}; \
@@ -31,6 +32,7 @@ push:
 	@echo '0' > ${status}
 	@$(foreach var,$(TARGETS), \
 		$(MAKE) -C $(var) $@ || echo '1' > ${status}; \
+		$(MAKE) -C $(var) -f Makefile.debian7 $@ || echo '1' > ${status}; \
 		$(MAKE) -C $(var) -f Makefile.debian9 $@ || echo '1' > ${status}; \
 		$(MAKE) -C $(var) -f Makefile.debian10 $@ || echo '1' > ${status}; \
 		$(MAKE) -C $(var) -f Makefile.debian11 $@ || echo '1' > ${status}; \
diff --git a/README.md b/README.md
index 4f77a535..8a69393c 100644
--- a/README.md
+++ b/README.md
@@ -119,6 +119,7 @@ it triggers the build of all Docker images for all architectures and Debian vers
 The file `go/Makefile.common` is the default Makefile used to build the Docker images for the different architectures.
 There is additional Makefile for each Debian version that is used to build the Docker images for that Debian version.
 
+* `go/Makefile.debian7`
 * `go/Makefile.debian9`
 * `go/Makefile.debian10`
 * `go/Makefile.debian11`
diff --git a/go/Makefile.debian7 b/go/Makefile.debian7
new file mode 100644
index 00000000..c94da8a0
--- /dev/null
+++ b/go/Makefile.debian7
@@ -0,0 +1,14 @@
+IMAGES         := base main
+DEBIAN_VERSION := 7
+TAG_EXTENSION  := -debian7
+
+export DEBIAN_VERSION TAG_EXTENSION
+
+build:
+	@$(foreach var,$(IMAGES),$(MAKE) -C $(var) build || exit 1;)
+
+# Requires login at https://docker.elastic.co:7000/.
+push:
+	@$(foreach var,$(IMAGES),$(MAKE) -C $(var) push || exit 1;)
+
+.PHONY: build push