diff --git a/Dockerfile.compute-node-v14 b/Dockerfile.compute-node-v14
index 7a3321c1e1..bea6e2642c 100644
--- a/Dockerfile.compute-node-v14
+++ b/Dockerfile.compute-node-v14
@@ -69,21 +69,17 @@ RUN wget https://github.com/postgrespro/pg_query_state/archive/refs/heads/master
     tar xvzf master.tar.gz && \
     cd pg_query_state-master && \
     export PATH="/usr/local/pgsql/bin:$PATH" && \
-    ./configure && \
-    make -j $(getconf _NPROCESSORS_ONLN) && \
-    make -j $(getconf _NPROCESSORS_ONLN) install && \
-    rm -rf /pg_query_state-* && \
+    USE_PGXS=true PG_CONFIG=/usr/local/pgsql/bin/pg_config make -j $(getconf _NPROCESSORS_ONLN) && \
+    USE_PGXS=true PG_CONFIG=/usr/local/pgsql/bin/pg_config make -j $(getconf _NPROCESSORS_ONLN) install && \
     echo 'trusted = true' >> /usr/local/pgsql/share/extension/pg_query_state.control
 
-RUN wget https://github.com/postgrespro/pg_wait_sampling/archive/refs/heads/master.tar.gz && \
-    tar xvzf master.tar.gz && \
-    cd pg_wait_sampling-master && \
-    export PATH="/usr/local/pgsql/bin:$PATH" && \
-    ./configure && \
-    make -j $(getconf _NPROCESSORS_ONLN) && \
-    make -j $(getconf _NPROCESSORS_ONLN) install && \
-    rm -rf /pg_wait_sampling-* && \
-    echo 'trusted = true' >> /usr/local/pgsql/share/extension/pg_wait_sampling.control
+# RUN wget https://github.com/postgrespro/pg_wait_sampling/archive/refs/heads/master.tar.gz && \
+#     tar xvzf master.tar.gz && \
+#     cd pg_wait_sampling-master && \
+#     export PATH="/usr/local/pgsql/bin:$PATH" && \
+#     make -j $(getconf _NPROCESSORS_ONLN) && \
+#     make -j $(getconf _NPROCESSORS_ONLN) install && \
+#     echo 'trusted = true' >> /usr/local/pgsql/share/extension/pg_wait_sampling.control
 
 
 #