diff --git a/docker/Dockerfile.opensuse b/docker/Dockerfile.opensuse
index 1bcea11fd6..2a066e05cf 100644
--- a/docker/Dockerfile.opensuse
+++ b/docker/Dockerfile.opensuse
@@ -24,7 +24,8 @@ RUN zypper --non-interactive update -y && \
     zypper --non-interactive dist-upgrade -y && \
     zypper --non-interactive install -y -t pattern devel_basis && \
     zypper --non-interactive install -y binutils-gold cmake curl dpkg-devel \
-        gcc-c++ git libnuma-devel openmpi3-devel python3-pip rpm-build wget && \
+        gcc-c++ git libdrm-devel libnuma-devel openmpi3-devel python3-pip rpm-build \
+        wget && \
     python3 -m pip install 'cmake==3.21'
 
 ARG ROCM_VERSION=0.0
@@ -43,7 +44,7 @@ RUN if [ "${ROCM_VERSION}" != "0.0" ]; then \
         zypper --non-interactive clean --all; \
     fi
 
-ARG PYTHON_VERSIONS="6 7 8 9 10 11 12"
+ARG PYTHON_VERSIONS="6 7 8 9 10 11 12 13"
 
 RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh && \
     bash miniconda.sh -b -p /opt/conda && \
diff --git a/docker/Dockerfile.opensuse.ci b/docker/Dockerfile.opensuse.ci
index ad416a78d3..bc5124d304 100644
--- a/docker/Dockerfile.opensuse.ci
+++ b/docker/Dockerfile.opensuse.ci
@@ -46,7 +46,7 @@ RUN cd /tmp/dyninst && \
     shopt -s dotglob extglob && \
     rm -rf *
 
-ARG PYTHON_VERSIONS="6 7 8 9 10 11 12"
+ARG PYTHON_VERSIONS="6 7 8 9 10 11 12 13"
 
 RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh && \
     bash miniconda.sh -b -p /opt/conda && \
diff --git a/docker/Dockerfile.rhel b/docker/Dockerfile.rhel
index c032a1a68b..78c523de5e 100644
--- a/docker/Dockerfile.rhel
+++ b/docker/Dockerfile.rhel
@@ -15,8 +15,8 @@ ENV LIBRARY_PATH ${LIBRARY_PATH}:/opt/amdgpu/lib64
 
 RUN yum groupinstall -y "Development Tools" && \
     yum install -y epel-release && crb enable && \
-    yum install -y --allowerasing cmake curl dpkg-devel numactl-devel openmpi-devel \
-        papi-devel python3-pip texinfo wget which zlib-devel && \
+    yum install -y --allowerasing cmake curl dpkg-devel libdrm-devel numactl-devel \
+        openmpi-devel papi-devel python3-pip texinfo wget which zlib-devel && \
     yum clean all && \
     python3 -m pip install 'cmake==3.21' && \
     python3 -m pip install 'perfetto'
@@ -37,7 +37,7 @@ RUN if [ "${ROCM_VERSION}" != "0.0" ]; then \
         yum clean all; \
     fi
 
-ARG PYTHON_VERSIONS="6 7 8 9 10 11 12"
+ARG PYTHON_VERSIONS="6 7 8 9 10 11 12 13"
 
 RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh && \
     bash miniconda.sh -b -p /opt/conda && \
diff --git a/docker/Dockerfile.rhel.ci b/docker/Dockerfile.rhel.ci
index 9ae294788d..e0e3be6936 100644
--- a/docker/Dockerfile.rhel.ci
+++ b/docker/Dockerfile.rhel.ci
@@ -37,7 +37,7 @@ RUN cd /tmp/dyninst && \
     shopt -s dotglob extglob && \
     rm -rf *
 
-ARG PYTHON_VERSIONS="6 7 8 9 10 11 12"
+ARG PYTHON_VERSIONS="6 7 8 9 10 11 12 13"
 
 RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh && \
     bash miniconda.sh -b -p /opt/conda && \
diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu
index a97367e7b7..6e7cfec112 100644
--- a/docker/Dockerfile.ubuntu
+++ b/docker/Dockerfile.ubuntu
@@ -15,11 +15,7 @@ WORKDIR /tmp
 SHELL [ "/bin/bash", "-c" ]
 
 ARG EXTRA_PACKAGES=""
-ARG ROCM_REPO_VERSION="debian"
 ARG ROCM_VERSION="0.0"
-ARG ROCM_REPO_DIST="ubuntu"
-ARG PYTHON_VERSIONS="6 7 8 9 10 11 12"
-ARG AMDGPU_DEB=6.0/ubuntu/focal/amdgpu-install_6.0.60000-1_all.deb
 ENV PATH ${HOME}/.local/bin:${PATH}
 
 RUN apt-get update && \
@@ -36,13 +32,21 @@ RUN apt-get update && \
     fi
 
 RUN if [ "${ROCM_VERSION}" != "0.0" ]; then \
-        wget https://repo.radeon.com/amdgpu-install/${ROCM_VERSION}/ubuntu/${ROCM_REPO_DIST}/${AMDGPU_DEB} && \
+        OS_VERSION=$(grep '^VERSION_ID=' /etc/os-release | cut -d'=' -f2 | tr -d '"') && \
+        OS_CODENAME=$(grep '^VERSION_CODENAME=' /etc/os-release | cut -d'=' -f2) && \
+        ROCM_MAJOR=$(echo "${ROCM_VERSION}" | sed 's/\./ /g' | awk '{print $1}') && \
+        ROCM_MINOR=$(echo "${ROCM_VERSION}" | sed 's/\./ /g' | awk '{print $2}') && \
+        ROCM_VERSN=$(( ("${ROCM_MAJOR}"*10000)+("${ROCM_MINOR}"*100) )) && \
+        AMDGPU_DEB="amdgpu-install_${ROCM_MAJOR}.${ROCM_MINOR}.${ROCM_VERSN}-1_all.deb" && \
+        wget https://repo.radeon.com/amdgpu-install/${ROCM_VERSION}/ubuntu/${OS_CODENAME}/${AMDGPU_DEB} && \
         apt-get install -y ./${AMDGPU_DEB} && \
         apt-get update && \
         apt-get install -y rocm-dev rccl-dev libpciaccess0 ${EXTRA_PACKAGES} && \
         apt-get autoclean; \
     fi
 
+ARG PYTHON_VERSIONS="6 7 8 9 10 11 12 13"
+
 RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh && \
     bash miniconda.sh -b -p /opt/conda && \
     export PATH="/opt/conda/bin:${PATH}" && \
diff --git a/docker/Dockerfile.ubuntu.ci b/docker/Dockerfile.ubuntu.ci
index 312949338b..52d1542fa8 100644
--- a/docker/Dockerfile.ubuntu.ci
+++ b/docker/Dockerfile.ubuntu.ci
@@ -49,7 +49,7 @@ RUN cd /tmp/dyninst && \
     shopt -s dotglob extglob && \
     rm -rf *
 
-ARG PYTHON_VERSIONS="6 7 8 9 10 11 12"
+ARG PYTHON_VERSIONS="6 7 8 9 10 11 12 13"
 
 RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh && \
     bash miniconda.sh -b -p /opt/conda && \
diff --git a/docker/build-docker-ci.sh b/docker/build-docker-ci.sh
index ca09bdfc96..e6694351b8 100755
--- a/docker/build-docker-ci.sh
+++ b/docker/build-docker-ci.sh
@@ -8,7 +8,7 @@ set -e
 : ${NJOBS=$(nproc)}
 : ${ELFUTILS_VERSION:=0.186}
 : ${BOOST_VERSION:=1.79.0}
-: ${PYTHON_VERSIONS:="6 7 8 9 10 11 12"}
+: ${PYTHON_VERSIONS:="6 7 8 9 10 11 12 13"}
 : ${PUSH:=0}
 : ${PULL:=--pull}
 
diff --git a/docker/build-docker-release.sh b/docker/build-docker-release.sh
index be7233f97a..30d1ca700d 100755
--- a/docker/build-docker-release.sh
+++ b/docker/build-docker-release.sh
@@ -101,7 +101,7 @@ reset-last
 : ${VERSIONS:=22.04 20.04}
 : ${ROCM_VERSIONS:=5.0 4.5 4.3}
 : ${MPI:=0}
-: ${PYTHON_VERSIONS:="6 7 8 9 10 11 12"}
+: ${PYTHON_VERSIONS:="6 7 8 9 10 11 12 13"}
 : ${RETRY:=3}
 
 n=0
diff --git a/docker/build-docker.sh b/docker/build-docker.sh
index 94d7fb5c66..39d22c58b4 100755
--- a/docker/build-docker.sh
+++ b/docker/build-docker.sh
@@ -4,7 +4,7 @@
 : ${ROCM_VERSIONS:="6.2"}
 : ${DISTRO:=ubuntu}
 : ${VERSIONS:=20.04}
-: ${PYTHON_VERSIONS:="6 7 8 9 10 11 12"}
+: ${PYTHON_VERSIONS:="6 7 8 9 10 11 12 13"}
 : ${BUILD_CI:=""}
 : ${PUSH:=0}
 : ${PULL:=--pull}
diff --git a/scripts/build-release.sh b/scripts/build-release.sh
index 87af1fe4f0..674eb5e681 100755
--- a/scripts/build-release.sh
+++ b/scripts/build-release.sh
@@ -37,7 +37,7 @@
 : ${MAX_THREADS:=2048}
 : ${PERFETTO_TOOLS:="ON"}
 : ${HIDDEN_VIZ:="ON"}
-: ${PYTHON_VERSIONS:="6 7 8 9 10 11 12"}
+: ${PYTHON_VERSIONS:="6 7 8 9 10 11 12 13"}
 : ${GENERATORS:="STGZ DEB RPM"}
 : ${MPI_IMPL:="openmpi"}
 : ${CLEAN:=0}
diff --git a/scripts/test-release.sh b/scripts/test-release.sh
index e6e035d692..f794e35dca 100755
--- a/scripts/test-release.sh
+++ b/scripts/test-release.sh
@@ -118,10 +118,21 @@ setup-env()
 
 test-install()
 {
+    ROCPROFSYS_MODULE_PATH="${1}/lib/python/site-packages/rocprofsys"
     verbose-run rocprof-sys-instrument --help
     verbose-run rocprof-sys-avail --help
     verbose-run rocprof-sys-avail --all
-    if [ -d "${1}/lib/python/site-packages/rocprofsys" ]; then
+
+    if [ -d $ROCPROFSYS_MODULE_PATH ]; then
+        verbose-run which python3
+        verbose-run python3 --version
+        PYTHON_VERSION=$(python3 -c "import sys; print(f'python-{sys.version_info.major}{sys.version_info.minor}')")
+
+        if [ -z "$(find $ROCPROFSYS_MODULE_PATH -name "*${PYTHON_VERSION}*" -print -quit)" ]; then
+            echo "Error: No library found for Python version ${PYTHON_VERSION} in $ROCPROFSYS_MODULE_PATH"
+            exit 1
+        fi
+
         verbose-run rocprof-sys-python --help
     fi
 }