diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
new file mode 100644
index 0000000..1b10737
--- /dev/null
+++ b/.github/workflows/docker-image.yml
@@ -0,0 +1,52 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ "main" ]
+    tags: [ 'v*.*.*' ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build_operator_image:
+    runs-on: self-hosted
+    steps:
+    - name: 'Checkout GitHub Action'
+      uses: actions/checkout@main
+    - name: 'Login to GitHub Container Registry'
+      uses: docker/login-action@v1
+      with:
+        registry: ghcr.io
+        username: ${{github.actor}}
+        password: ${{secrets.GITHUB_TOKEN}}
+    - uses: actions/checkout@v3
+    - name: Build the Docker image
+      run: |
+        if [[ $GITHUB_REF == 'refs/heads/main' ]]; then
+          TAG=latest
+        else
+          TAG=$(${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}| tr / -)
+        fi
+        docker build . --file Dockerfile --tag ghcr.io/dell/remote-development-operator:$TAG
+        docker push ghcr.io/dell/remote-development-operator:$TAG
+  build_devenv_image:
+    runs-on: self-hosted
+    steps:
+    - name: 'Checkout GitHub Action'
+      uses: actions/checkout@main
+    - name: 'Login to GitHub Container Registry'
+      uses: docker/login-action@v1
+      with:
+        registry: ghcr.io
+        username: ${{github.actor}}
+        password: ${{secrets.GITHUB_TOKEN}}
+    - uses: actions/checkout@v3
+    - name: Build the Docker image
+      run: |
+       if [[ $GITHUB_REF == 'refs/heads/main' ]]; then
+          TAG=latest
+        else
+          TAG=$(${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}| tr / -)
+        fi
+        docker build . --file Dockerfile --tag ghcr.io/dell/remote-development-operator/devenv:$TAG
+        docker push ghcr.io/dell/remote-development-operator/devenv:$TAG