diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index cc1e8a6a..f5d9082f 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -47,7 +47,7 @@ jobs:
           platforms: linux/amd64, linux/arm64, linux/arm/v7
           push: true
           tags: ${{ github.repository }}:${{ env.TAG }}, ${{ github.repository }}:latest
-          build-args: version=${{ env.TAG }}
+          build-args: version=${{ env.TAG }}, tags="-tags=ce"
 
   docker-ee:
     runs-on: ubuntu-latest
diff --git a/Dockerfile b/Dockerfile
index faaa8a9f..11ced429 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ COPY . .
 ENV GO111MODULE=auto
 
 RUN apk add git
-RUN GOOS=linux CGO_ENABLED=1 go build ${tags} -ldflags="-s -X 'main.version=${version}'" .
+RUN GOOS=linux CGO_ENABLED=1 go build -ldflags="-s -X 'main.version=${version}'" ${tags} .
 # RUN go build -tags=ee . -o netmaker main.go
 FROM alpine:3.16.2