diff --git a/conf.py b/conf.py
index 694e379db..cbcb324a7 100644
--- a/conf.py
+++ b/conf.py
@@ -120,7 +120,7 @@
                 "java-base": "11",
                 "java-devel": "11",
                 "async_profiler": "2.9",
-                "phoenix": "5.1.3",
+                "phoenix": "5.2.0",
                 "hbase_profile": "2.4",
                 "hadoop": "3.3.6",
                 "jmx_exporter": "0.20.0",
diff --git a/hbase/Dockerfile b/hbase/Dockerfile
index bfcabfaf9..f013efdfd 100644
--- a/hbase/Dockerfile
+++ b/hbase/Dockerfile
@@ -27,12 +27,12 @@ WORKDIR /stackable
 
 # The release scripts of HBase also run the build twice (three times in fact, once again to build the site which we skip here).
 # I chose to replicate that exact behavior for consistency so please don't merge the two mvn runs into one unless you really know what you're doing!
-RUN curl --fail -L "https://repo.stackable.tech/repository/packages/hbase/hbase-${PRODUCT}-src.tar.gz" | tar -xzC .
-RUN mv hbase-${PRODUCT} hbase-${PRODUCT}-src
+RUN curl --fail -L "https://repo.stackable.tech/repository/packages/hbase/hbase-${PRODUCT}-src.tar.gz" | tar -xzC . && \
+    mv hbase-${PRODUCT} hbase-${PRODUCT}-src
 COPY --chown=stackable:stackable hbase/stackable/patches /stackable/patches
-RUN chmod +x patches/apply_patches.sh
-RUN patches/apply_patches.sh ${PRODUCT}
-RUN cd /stackable/hbase-${PRODUCT}-src/ && \
+RUN chmod +x patches/apply_patches.sh && \
+    patches/apply_patches.sh ${PRODUCT} && \
+    cd /stackable/hbase-${PRODUCT}-src/ && \
     mvn -Dhadoop.profile=3.0 -Dhadoop-three.version=${HADOOP} clean install -DskipTests && \
     mvn -Dhadoop.profile=3.0 -Dhadoop-three.version=${HADOOP} install assembly:single -DskipTests -Dcheckstyle.skip=true -Prelease && \
     tar -xzf hbase-assembly/target/hbase-${PRODUCT}-bin.tar.gz -C /stackable/ && \
@@ -164,7 +164,7 @@ RUN ln -s /stackable/hbase-${PRODUCT} /stackable/hbase && \
 USER stackable
 ENV HBASE_CONF_DIR=/stackable/hbase/conf
 ENV HOME=/stackable
-ENV PATH="${PATH}":/stackable/bin:/stackable/hbase/bin
+ENV PATH="${PATH}:/stackable/bin:/stackable/hbase/bin"
 ENV ASYNC_PROFILER_HOME=/stackable/async-profiler
 
 # Mitigation for CVE-2021-44228 (Log4Shell)