diff --git a/darwin/Dockerfile b/darwin/Dockerfile
index 8e8bfd9..b72ec95 100644
--- a/darwin/Dockerfile
+++ b/darwin/Dockerfile
@@ -75,8 +75,9 @@ RUN mv /toolchain/src/src/libusb-1.0.24 /toolchain/src/src/libusb
 ADD https://github.com/libusb/hidapi/archive/refs/tags/hidapi-0.14.0.tar.gz /toolchain/src/src/archives/
 RUN tar -xvf /toolchain/src/src/archives/hidapi-0.14.0.tar.gz -C /toolchain/src/src/
 RUN mv /toolchain/src/src/hidapi-hidapi-0.14.0 /toolchain/src/src/hidapi
-RUN git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd
-RUN bash -c "cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3"
+
+RUN bash -c "git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd && cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3"
+
 ADD scripts/build-mac-flipper-tools.sh /toolchain/src/
 RUN bash /toolchain/src/build-mac-flipper-tools.sh
 ADD scripts/relink.sh /usr/bin/
diff --git a/linux/Dockerfile-aarch64 b/linux/Dockerfile-aarch64
index acbe1e5..cb4815f 100644
--- a/linux/Dockerfile-aarch64
+++ b/linux/Dockerfile-aarch64
@@ -104,8 +104,7 @@ ADD https://github.com/libusb/hidapi/archive/refs/tags/hidapi-0.14.0.tar.gz /too
 RUN tar -xvf /toolchain/src/src/archives/hidapi-0.14.0.tar.gz -C /toolchain/src/src/
 RUN mv /toolchain/src/src/hidapi-hidapi-0.14.0 /toolchain/src/src/hidapi
 
-RUN git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd
-RUN bash -c "cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3"
+RUN bash -c "git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd && cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3"
 
 ADD scripts/relink.sh /usr/bin/
 ADD scripts/build-linux-flipper-tools.sh /toolchain/src/
diff --git a/linux/Dockerfile-x86_64 b/linux/Dockerfile-x86_64
index 05fca79..d50c7ff 100644
--- a/linux/Dockerfile-x86_64
+++ b/linux/Dockerfile-x86_64
@@ -104,8 +104,7 @@ ADD https://github.com/libusb/hidapi/archive/refs/tags/hidapi-0.14.0.tar.gz /too
 RUN tar -xvf /toolchain/src/src/archives/hidapi-0.14.0.tar.gz -C /toolchain/src/src/
 RUN mv /toolchain/src/src/hidapi-hidapi-0.14.0 /toolchain/src/src/hidapi
 
-RUN git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd
-RUN bash -c "cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3"
+RUN bash -c "git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd && cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3"
 
 ADD scripts/relink.sh /usr/bin/
 ADD scripts/build-linux-flipper-tools.sh /toolchain/src/
diff --git a/windows/Dockerfile b/windows/Dockerfile
index a1f0fe4..8666ee9 100644
--- a/windows/Dockerfile
+++ b/windows/Dockerfile
@@ -72,8 +72,7 @@ ADD https://github.com/libusb/hidapi/archive/refs/tags/hidapi-0.14.0.tar.gz /too
 RUN tar -xvf /toolchain/src/src/archives/hidapi-0.14.0.tar.gz -C /toolchain/src/src/
 RUN mv /toolchain/src/src/hidapi-hidapi-0.14.0 /toolchain/src/src/hidapi
 
-RUN git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd
-RUN bash -c "cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3"
+RUN bash -c "git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd && cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3"
 
 ADD scripts/build-windows-flipper-tools.sh /toolchain/src/
 RUN bash /toolchain/src/build-windows-flipper-tools.sh