diff --git a/.github/workflows/build_dockerhub_img.yml b/.github/workflows/build_dockerhub_img.yml
index 2487c2f0..eeb5834b 100644
--- a/.github/workflows/build_dockerhub_img.yml
+++ b/.github/workflows/build_dockerhub_img.yml
@@ -10,6 +10,10 @@ on:
   # pull_request:
   #   branches: [ "main" ]
 
+env:
+  REGISTRY: ghcr.io
+  IMAGE: answerdev/answer
+
 jobs:
   build:
     runs-on: [self-hosted, linux]
@@ -34,6 +38,13 @@ jobs:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v2
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
     - name: Extract metadata
       id: meta
       uses: docker/metadata-action@v3
@@ -69,5 +80,10 @@ jobs:
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
 
+    - name: Push image to GHCR
+      run: |
+        docker buildx imagetools create \
+          --tag ghcr.io/${{ env.REGISTRY }}/${{ env.IMAGE }}:latest
+          ${{ env.REGISTRY }}/${{ env.IMAGE }}:latest
 
 
diff --git a/.github/workflows/build_img.yml b/.github/workflows/build_img.yml
new file mode 100644
index 00000000..dec31474
--- /dev/null
+++ b/.github/workflows/build_img.yml
@@ -0,0 +1,89 @@
+name: Build Docker Hub Image
+
+on:
+  push:
+    branches: [ "githubaction" ]
+    tags:
+      - v2.*
+      - v1.*
+      - v0.*
+  # pull_request:
+  #   branches: [ "main" ]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE: answerdev/answer
+
+jobs:
+  build:
+    runs-on: [self-hosted, linux]
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+      with:
+        platforms: linux/amd64,linux/arm64
+        version: latest
+        endpoint: builders
+        driver: docker
+
+    - name: Login to DockerHub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v2
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Extract metadata
+      id: meta
+      uses: docker/metadata-action@v3
+      with:
+        images: answerdev/answer
+        tags: |
+              type=raw,value=latest
+              # branch event
+              type=ref,enable=true,priority=600,prefix=,suffix=,event=branch
+              # tag event
+              #type=ref,enable=true,priority=600,prefix=,suffix=,event=tag
+              type=semver,pattern={{version}}
+
+
+
+    - name: Build amd64
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        file: ./Dockerfile
+        platforms: linux/amd64
+        push: true
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
+
+    - name: Build arm64
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        file: ./Dockerfile
+        platforms: linux/arm64
+        push: true
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
+
+    - name: Push image to GHCR
+      run: |
+        docker buildx imagetools create \
+          --tag ghcr.io/${{ env.REGISTRY }}/${{ env.IMAGE }}:latest
+          ${{ env.REGISTRY }}/${{ env.IMAGE }}:latest
+
+