diff --git a/projects/rocdecode/docker/rocDecode-on-ubuntu20.dockerfile b/projects/rocdecode/docker/rocDecode-on-ubuntu20.dockerfile
new file mode 100644
index 0000000000..5dfd8019f9
--- /dev/null
+++ b/projects/rocdecode/docker/rocDecode-on-ubuntu20.dockerfile
@@ -0,0 +1,18 @@
+FROM ubuntu:20.04
+
+# install base dependencies
+RUN apt-get update -y
+#RUN apt-get dist-upgrade -y
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gcc g++ cmake pkg-config git apt-utils sudo vainfo dialog
+
+# install ROCm
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install initramfs-tools libnuma-dev wget keyboard-configuration && \
+        wget https://repo.radeon.com/amdgpu-install/6.1/ubuntu/focal/amdgpu-install_6.1.60100-1_all.deb && \
+        sudo apt-get install ./amdgpu-install_6.1.60100-1_all.deb && \
+        sudo amdgpu-install -y --usecase=multimediasdk,rocm --no-32
+
+WORKDIR /workspace
+
+# clone rocDecode and build
+RUN git clone https://github.com/ROCm/rocDecode.git && \
+        cd rocDecode && mkdir build && cd build && cmake .. && make -j8 && sudo make install
\ No newline at end of file
diff --git a/projects/rocdecode/docker/rocDecode-on-ubuntu22.dockerfile b/projects/rocdecode/docker/rocDecode-on-ubuntu22.dockerfile
new file mode 100644
index 0000000000..02ae4db363
--- /dev/null
+++ b/projects/rocdecode/docker/rocDecode-on-ubuntu22.dockerfile
@@ -0,0 +1,18 @@
+FROM ubuntu:22.04
+
+# install base dependencies
+RUN apt-get update -y
+#RUN apt-get dist-upgrade -y
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gcc g++ cmake pkg-config git apt-utils sudo vainfo dialog libstdc++-12-dev
+
+# install ROCm
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install initramfs-tools libnuma-dev wget keyboard-configuration && \
+        wget https://repo.radeon.com/amdgpu-install/6.1/ubuntu/jammy/amdgpu-install_6.1.60100-1_all.deb && \
+        sudo apt-get install ./amdgpu-install_6.1.60100-1_all.deb && \
+        sudo amdgpu-install -y --usecase=multimediasdk,rocm --no-32
+
+WORKDIR /workspace
+
+# clone rocDecode and build
+RUN git clone https://github.com/ROCm/rocDecode.git && \
+        cd rocDecode && mkdir build && cd build && cmake .. && make -j8 && sudo make install
\ No newline at end of file
diff --git a/projects/rocdecode/docker/vcnDECODE-on-ubuntu20.dockerfile b/projects/rocdecode/docker/vcnDECODE-on-ubuntu20.dockerfile
deleted file mode 100644
index 9be93d5469..0000000000
--- a/projects/rocdecode/docker/vcnDECODE-on-ubuntu20.dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM ubuntu:20.04
-
-# install base dependencies
-RUN apt-get update -y
-#RUN apt-get dist-upgrade -y
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gcc g++ cmake pkg-config git apt-utils sudo vainfo dialog
-
-# install ROCm
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install initramfs-tools libnuma-dev wget keyboard-configuration && \
-        wget https://repo.radeon.com/amdgpu-install/5.7/ubuntu/focal/amdgpu-install_5.7.50700-1_all.deb && \
-        sudo apt-get install ./amdgpu-install_5.7.50700-1_all.deb && \
-        sudo amdgpu-install -y --usecase=graphics,rocm --no-32
-
-# install FFMPEG, and other dependencies
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install autoconf automake build-essential cmake git-core libass-dev libfreetype6-dev libsdl2-dev libtool libva-dev \
-        libvdpau-dev libvorbis-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev pkg-config texinfo wget zlib1g-dev \
-        nasm yasm libx264-dev libx265-dev libnuma-dev libfdk-aac-dev unzip && \
-        wget https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n4.4.2.zip && unzip n4.4.2.zip && cd FFmpeg-n4.4.2/ && sudo ldconfig && \
-        export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig/" && \
-        ./configure --enable-shared --disable-static && \
-        make -j8 && sudo make install && cd
-
-ENV LD_LIBRARY_PATH="/usr/local/lib:/usr/local/lib64/:/usr/local/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH"
-
-WORKDIR /workspace
-
diff --git a/projects/rocdecode/docker/vcnDECODE-on-ubuntu22.dockerfile b/projects/rocdecode/docker/vcnDECODE-on-ubuntu22.dockerfile
deleted file mode 100644
index d3c7fb898c..0000000000
--- a/projects/rocdecode/docker/vcnDECODE-on-ubuntu22.dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM ubuntu:22.04
-
-# install base dependencies
-RUN apt-get update -y
-#RUN apt-get dist-upgrade -y
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gcc g++ cmake pkg-config git apt-utils sudo vainfo dialog libstdc++-12-dev
-
-# install ROCm
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install initramfs-tools libnuma-dev wget keyboard-configuration && \
-        wget https://repo.radeon.com/amdgpu-install/5.7/ubuntu/jammy/amdgpu-install_5.7.50700-1_all.deb && \
-        sudo apt-get install ./amdgpu-install_5.7.50700-1_all.deb && \
-        sudo amdgpu-install -y --usecase=graphics,rocm --no-32
-
-# install FFMPEG, and other dependencies
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install autoconf automake build-essential cmake git-core libass-dev libfreetype6-dev libsdl2-dev libtool libva-dev \
-        libvdpau-dev libvorbis-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev pkg-config texinfo wget zlib1g-dev \
-        nasm yasm libx264-dev libx265-dev libnuma-dev libfdk-aac-dev unzip && \
-        wget https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n4.4.2.zip && unzip n4.4.2.zip && cd FFmpeg-n4.4.2/ && sudo ldconfig && \
-        export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig/" && \
-        ./configure --enable-shared --disable-static && \
-        make -j8 && sudo make install && cd
-
-ENV LD_LIBRARY_PATH="/usr/local/lib:/usr/local/lib64/:/usr/local/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH"
-
-WORKDIR /workspace