diff --git a/Dockerfile b/Dockerfile
index da09ae2427a0f..c697c2b6762da 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -65,11 +65,14 @@ RUN mkdir -p ${PYTHONPATH} \
             libsasl2-modules-gssapi-mit \
             libpq-dev \
             libecpg-dev \
+            git \
         && rm -rf /var/lib/apt/lists/*
 
 COPY ./requirements/*.txt  /app/requirements/
 COPY setup.py MANIFEST.in README.md /app/
 
+RUN pip install --force-reinstall git+https://github.com/HPEEzmeral/ezua-gunicorn.git@master
+
 # setup.py uses the version information in package.json
 COPY superset-frontend/package.json /app/superset-frontend/
 
@@ -139,9 +142,6 @@ RUN cd /app \
     && pip install --no-cache -r requirements/docker.txt \
     && pip install --no-cache -r requirements/requirements-local.txt || true
 
-# # Fix for EZAF-583 was moved here as the network may be not available in the non-airgap environment
-# RUN apt-get update ; apt-get upgrade -y ; apt-get install -y git ; \
-#     pip install --force-reinstall git+https://github.com/benoitc/gunicorn.git@master
 USER superset
 
 
diff --git a/requirements/base.txt b/requirements/base.txt
index 74cf2b865caa2..3e7931f79bdb5 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -117,8 +117,8 @@ geopy==2.2.0
     # via apache-superset
 graphlib-backport==1.0.3
     # via apache-superset
-gunicorn==20.1.0
-    # via apache-superset
+# gunicorn==20.1.0
+#     # via apache-superset
 hashids==1.3.1
     # via apache-superset
 hijri-converter==2.2.4