diff --git a/client/container_preparation/Dockerfile b/client/container_preparation/Dockerfile
index ab67eea..bdcb9e2 100644
--- a/client/container_preparation/Dockerfile
+++ b/client/container_preparation/Dockerfile
@@ -18,7 +18,7 @@ RUN tar xvf spire-1.9.1-linux-amd64-musl.tar.gz ; mv spire-1.9.1 /opt ; mv /opt/
 RUN ln -s /opt/spire/bin/spire-agent /usr/bin/spire-agent
 
 # Install pyspiffe package
-RUN pip install git+https://github.com/HewlettPackard/py-spiffe.git
+RUN pip install git+https://github.com/HewlettPackard/py-spiffe.git@3640af9d6629c05e027f99010abc934cb74122a8
 
 # Create code directory, output directory
 RUN mkdir /container_preparation /output ; chmod -R 777 /output
diff --git a/client/data_preparation/Dockerfile b/client/data_preparation/Dockerfile
index fbbdea1..9c34410 100644
--- a/client/data_preparation/Dockerfile
+++ b/client/data_preparation/Dockerfile
@@ -20,7 +20,7 @@ RUN tar xvf spire-1.9.1-linux-amd64-musl.tar.gz ; mv spire-1.9.1 /opt ; mv /opt/
 RUN ln -s /opt/spire/bin/spire-agent /usr/bin/spire-agent
 
 # Install pyspiffe package
-RUN pip install git+https://github.com/HewlettPackard/py-spiffe.git
+RUN pip install git+https://github.com/HewlettPackard/py-spiffe.git@3640af9d6629c05e027f99010abc934cb74122a8
 
 # Create code directory, output directory
 RUN mkdir /data_preparation /output
diff --git a/server/Dockerfile b/server/Dockerfile
index fd1aa1b..a2bc5e3 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -13,7 +13,7 @@ RUN ln -s /opt/spire/bin/spire-agent /usr/bin/spire-agent
 RUN ln -s /opt/spire/bin/spire-server /usr/bin/spire-server
 
 # Install pyspiffe package
-RUN pip install git+https://github.com/HewlettPackard/py-spiffe.git
+RUN pip install git+https://github.com/HewlettPackard/py-spiffe.git@3640af9d6629c05e027f99010abc934cb74122a8
 
 # Copy server
 RUN mkdir /server