diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml
index 47f0e43..71078ca 100644
--- a/.forgejo/workflows/release.yaml
+++ b/.forgejo/workflows/release.yaml
@@ -2,9 +2,7 @@ on:
   push:
     tags:
       - "latest"
-      - "v*"
 env:
-  IMAGE_TAG_PRIVATE: git.myservermanager.com/msm/forgejo-base-executor-image
   FORGEJO_FQDN: git.myservermanager.com
 jobs:
   build:
@@ -34,9 +32,18 @@ jobs:
           username: ${{ secrets.FORGEJO_USER }}
           password: ${{ secrets.FORGEJO_TOKEN }}
 
-      - name: Build docker image
+      - name: Build docker image - base
         uses: docker/build-push-action@v4
         with:
+          file: Dockerfile
           push: true
           tags: |
-            ${{ env.IMAGE_TAG_PRIVATE }}:latest
+            git.myservermanager.com/msm/forgejo-base-executor-image:latest
+
+      - name: Build docker image - make cgo
+        uses: docker/build-push-action@v4
+        with:
+          file: Dockerfile-make-cgo
+          push: true
+          tags: |
+            git.myservermanager.com/msm/forgejo-base-executor-image-make-cgo:latest
diff --git a/.forgejo/workflows/release_rebuild.yaml b/.forgejo/workflows/release_rebuild.yaml
index 3c37d43..b457e2b 100644
--- a/.forgejo/workflows/release_rebuild.yaml
+++ b/.forgejo/workflows/release_rebuild.yaml
@@ -2,7 +2,6 @@ on:
   schedule:
     - cron: "0 0 1 * *"
 env:
-  IMAGE_TAG_PRIVATE: git.myservermanager.com/msm/forgejo-base-executor-image
   FORGEJO_FQDN: git.myservermanager.com
 jobs:
   build:
@@ -32,9 +31,18 @@ jobs:
           username: ${{ secrets.FORGEJO_USER }}
           password: ${{ secrets.FORGEJO_TOKEN }}
 
-      - name: Build docker image
+      - name: Build docker image - base
         uses: docker/build-push-action@v4
         with:
+          file: Dockerfile
           push: true
           tags: |
-            ${{ env.IMAGE_TAG_PRIVATE }}:latest
+            git.myservermanager.com/msm/forgejo-base-executor-image:latest
+
+      - name: Build docker image - make cgo
+        uses: docker/build-push-action@v4
+        with:
+          file: Dockerfile-make-cgo
+          push: true
+          tags: |
+            git.myservermanager.com/msm/forgejo-base-executor-image-make-cgo:latest
diff --git a/Dockerfile b/Dockerfile
index 2caf5b5..814c9d6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,11 @@
 FROM ubuntu:24.04
 LABEL maintainer="msm <hostmaster@myservermanager.com>"
 
+# base line required by Forgejo Runner: nodejs, npm, git
+# added: docker and buildx
 RUN <<EOF
 apt-get update
-apt-get install -y --no-install-recommends curl wget bash apt-transport-https ca-certificates gnupg nodejs npm git zstd make clang
+apt-get install -y --no-install-recommends curl wget bash apt-transport-https ca-certificates gnupg nodejs npm git zstd
 curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker.gpg
 echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/debian bookworm stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
 apt-get update
diff --git a/Dockerfile-make-cgo b/Dockerfile-make-cgo
new file mode 100644
index 0000000..0edc74f
--- /dev/null
+++ b/Dockerfile-make-cgo
@@ -0,0 +1,8 @@
+FROM git.myservermanager.com/msm/forgejo-base-executor-image
+
+# added: make and clang for CGO compile
+RUN <<EOF
+apt-get update
+apt-get install -y --no-install-recommends build-essential make clang
+rm -rf /var/lib/apt/lists/\* /tmp/\* /var/tmp/*
+EOF