diff --git a/.github/workflows/build-docker-compose-images.yaml b/.github/workflows/build-docker-compose-images.yaml
index 5959dbcc3..2e98d09c2 100644
--- a/.github/workflows/build-docker-compose-images.yaml
+++ b/.github/workflows/build-docker-compose-images.yaml
@@ -13,9 +13,11 @@ jobs:
       DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
       DOCKER_REPOSITORY: "zammad-docker-compose"
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-      REPO_USER: ${{ secrets.REPO_USER }}
     steps:
-      - name: Checkout code
+     - name: Alias GITHUB_ACTOR as REPO_USER
+      run: |
+        echo "::set-env name=REPO_USER::$GITHUB_ACTOR"
+     - name: Checkout code
         uses: actions/checkout@master
       - name: Fetch all history for all tags and branches
         run: git fetch --prune --unshallow
diff --git a/.github/workflows/build-docker-image.yaml b/.github/workflows/build-docker-image.yaml
index 9e9cf9086..a1a4e8389 100644
--- a/.github/workflows/build-docker-image.yaml
+++ b/.github/workflows/build-docker-image.yaml
@@ -13,8 +13,10 @@ jobs:
       DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
       DOCKER_REPOSITORY: "zammad"
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-      REPO_USER: ${{ secrets.REPO_USER }}
     steps:
+      - name: Alias GITHUB_ACTOR as REPO_USER
+        run: |
+          echo "::set-env name=REPO_USER::$GITHUB_ACTOR"
       - name: Checkout code
         uses: actions/checkout@master
       - name: Fetch all history for all tags and branches