diff --git a/.github/workflows/docker-builder.yml b/.github/workflows/docker-builder.yml
index d23a1230..91c38863 100644
--- a/.github/workflows/docker-builder.yml
+++ b/.github/workflows/docker-builder.yml
@@ -23,6 +23,6 @@ jobs:
       with:
         context: .
         push: true
-        platforms: linux/amd64, linux/arm64
+        platforms: linux/amd64, linux/arm64, linux/armv7l
         file: ./docker/Dockerfile-go-builder
         tags: gravitl/go-builder:latest
diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 712c909b..790aaeac 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -55,7 +55,7 @@ jobs:
             sleep 10
             kill %1
       -
-        name: Build arm and export to Docker
+        name: Build arm64 and export to Docker
         uses: docker/build-push-action@v2
         with:
           context: .
@@ -64,7 +64,22 @@ jobs:
           tags: ${{ env.TAG }}
           build-args: version=${{ env.TAG }}
       -
-        name: Test arm
+        name: Test arm64
+        run: |
+            docker run --rm ${{ env.TAG }}&
+            sleep 10
+            kill %1
+      -
+        name: Build armv7l and export to Docker
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          load: true
+          platforms: linux/armv7l
+          tags: ${{ env.TAG }}
+          build-args: version=${{ env.TAG }}
+      -
+        name: Test armv7l
         run: |
             docker run --rm ${{ env.TAG }}&
             sleep 10
@@ -74,7 +89,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          platforms: linux/amd64, linux/arm64
+          platforms: linux/amd64, linux/arm64, linux/armv7l
           push: true
           tags: ${{ github.repository }}:${{ env.TAG }}, ${{ github.repository }}:latest
           build-args: version=${{ env.TAG }}
diff --git a/.github/workflows/publish-netclient-docker.yml b/.github/workflows/publish-netclient-docker.yml
index 46de1df7..c1111701 100644
--- a/.github/workflows/publish-netclient-docker.yml
+++ b/.github/workflows/publish-netclient-docker.yml
@@ -56,7 +56,7 @@ jobs:
             sleep 10
             kill %1
       -
-        name: Build arm and export to Docker
+        name: Build arm64 and export to Docker
         uses: docker/build-push-action@v2
         with:
           context: .
@@ -66,7 +66,23 @@ jobs:
           tags: ${{ env.TAG }}
           build-args: version=${{ env.TAG }}  
       -
-        name: Test arm
+        name: Test arm64
+        run: |
+            docker run --rm ${{ env.TAG }}&
+            sleep 10
+            kill %1
+      -
+        name: Build armv7l and export to Docker
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          load: true
+          platforms: linux/armv7l
+          file: ./docker/Dockerfile-netclient-multiarch
+          tags: ${{ env.TAG }}
+          build-args: version=${{ env.TAG }}  
+      -
+        name: Test armv7l
         run: |
             docker run --rm ${{ env.TAG }}&
             sleep 10
@@ -76,7 +92,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          platforms: linux/amd64, linux/arm64
+          platforms: linux/amd64, linux/arm64, linux/armv7l
           file: ./docker/Dockerfile-netclient-multiarch
           push: true
           tags: gravitl/netclient:${{ env.TAG }}, gravitl/netclient:latest