diff --git a/ci/phoenix/Dockerfile b/ci/phoenix/Dockerfile
index dc08385..0181c60 100644
--- a/ci/phoenix/Dockerfile
+++ b/ci/phoenix/Dockerfile
@@ -21,7 +21,10 @@ RUN wget --no-verbose -O phoenix.tar.gz "$PHOENIX_URL" && \
 RUN ln -sv /opt/phoenix/phoenix-*-server.jar /opt/hbase/lib/
 
 ADD hbase-site.xml /opt/hbase/conf/hbase-site.xml
-ADD hbase-site.xml /opt/phoenix/bin/hbase-site.xml
+
+ENV HBASE_CONF_DIR /opt/hbase/conf
+ENV HBASE_CP /opt/hbase/lib
+ENV HBASE_HOME /opt/hbase
 
 EXPOSE 8765
 
diff --git a/ci/phoenix/docker-entrypoint.sh b/ci/phoenix/docker-entrypoint.sh
index 13c98b0..0bcc6da 100755
--- a/ci/phoenix/docker-entrypoint.sh
+++ b/ci/phoenix/docker-entrypoint.sh
@@ -5,7 +5,7 @@ pids=()
 /opt/hbase/bin/hbase-daemon.sh foreground_start master &
 pids+=($!)
 
-/opt/phoenix/bin/queryserver.py -Dphoenix.schema.isNamespaceMappingEnabled=true &
+/opt/phoenix/bin/queryserver.py &
 pids+=($!)
 
 cleanup() {