diff --git a/docker/gaffer-pyspark-notebook/Dockerfile b/docker/gaffer-pyspark-notebook/Dockerfile
index ddebb210..8bce231a 100644
--- a/docker/gaffer-pyspark-notebook/Dockerfile
+++ b/docker/gaffer-pyspark-notebook/Dockerfile
@@ -60,12 +60,12 @@ ARG KUBECTL_VERSION=1.23.0
 RUN curl -fLo /bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl && \
 	chmod +x /bin/kubectl
 
-ARG GAFFERPY_VERSION=gaffer-tools-2.0.0
-RUN git clone -b ${GAFFERPY_VERSION} --depth 1 https://github.com/gchq/gaffer-tools && \
-	pushd gaffer-tools/python-shell && \
+ARG GAFFERPY_VERSION=gafferpy-2.0.0
+RUN git clone -b ${GAFFERPY_VERSION} --depth 1 https://github.com/gchq/gafferpy && \
+	pushd gafferpy && \
 	python setup.py install && \
 	popd && \
-	rm -rf gaffer-tools
+	rm -rf gafferpy
 
 RUN jupyter labextension install jupyterlab-plotly@5.5.0 && \
 	rm -rf "/home/${NB_USER}/.cache/yarn"
diff --git a/docker/gaffer-pyspark-notebook/README.md b/docker/gaffer-pyspark-notebook/README.md
index 372f7304..f64fb119 100644
--- a/docker/gaffer-pyspark-notebook/README.md
+++ b/docker/gaffer-pyspark-notebook/README.md
@@ -8,7 +8,7 @@ This extends [scipy-notebook](https://github.com/jupyter/docker-stacks/tree/mast
 * Hadoop
 * Spark
 * `kubectl` and the `kubernetes` python package
-* [gafferpy](https://github.com/gchq/gaffer-tools/tree/master/python-shell)
+* [gafferpy](https://github.com/gchq/gafferpy/tree/main/)
 
 Some example notebooks that demonstrate how to query Gaffer and use Spark are available at [`/examples`](examples/).
 
diff --git a/docker/gaffer-pyspark-notebook/docker-compose.yaml b/docker/gaffer-pyspark-notebook/docker-compose.yaml
index 90b947de..4423e9a6 100644
--- a/docker/gaffer-pyspark-notebook/docker-compose.yaml
+++ b/docker/gaffer-pyspark-notebook/docker-compose.yaml
@@ -222,7 +222,7 @@ services:
       args:
         HADOOP_VERSION: ${HADOOP_VERSION}
         SPARK_VERSION: ${SPARK_VERSION}
-        GAFFERPY_VERSION: gaffer-tools-${GAFFERPY_VERSION}
+        GAFFERPY_VERSION: gafferpy-${GAFFERPY_VERSION}
         KUBECTL_VERSION: ${KUBECTL_VERSION}
     ports:
     - 8888:8888