diff --git a/.circleci/config.yml b/.circleci/config.yml
index 38b49d6f..c09390bf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,7 +14,7 @@ version: 2
         command: |
           BRANCH=$([ -z "$CIRCLE_TAG" ] && echo "$CIRCLE_BRANCH" || echo "master")
 
-          make CFLAGS="${CFLAGS}" GIT_BRANCH="${BRANCH}" GIT_TAG="${CIRCLE_TAG}"
+          make GIT_BRANCH="${BRANCH}" GIT_TAG="${CIRCLE_TAG}"
           file pihole-FTL
     - run:
         name: "Upload"
@@ -59,7 +59,6 @@ jobs:
     <<: *job_template
     environment:
       BIN_NAME: "pihole-FTL-linux-x86_32"
-      CFLAGS: "-m32"
 
 workflows:
   version: 2
diff --git a/docker/x86_32/Dockerfile b/docker/x86_32/Dockerfile
index 2555601a..87dae55e 100644
--- a/docker/x86_32/Dockerfile
+++ b/docker/x86_32/Dockerfile
@@ -5,4 +5,4 @@ RUN dpkg --add-architecture i386 && \
     apt-get install -y --no-install-recommends nettle-dev:i386 gcc gcc-multilib \
         make file wget netcat-traditional sqlite3 git ca-certificates ssh libcap-dev:i386
 
-ENV CC gcc
+ENV CC "gcc -m32"