diff --git a/8.0/Dockerfile b/8.0/Dockerfile
index 5d949984..8cb3b921 100644
--- a/8.0/Dockerfile
+++ b/8.0/Dockerfile
@@ -64,6 +64,11 @@ COPY 8.0/root-common /
 COPY 8.0/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 8.0/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -72,9 +77,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     /usr/libexec/container-setup && \
     rpm-file-permissions
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
 
 USER 27
 
diff --git a/8.0/Dockerfile.c8s b/8.0/Dockerfile.c8s
index 39461477..6060adb3 100644
--- a/8.0/Dockerfile.c8s
+++ b/8.0/Dockerfile.c8s
@@ -53,6 +53,11 @@ COPY 8.0/root-common /
 COPY 8.0/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 8.0/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -62,10 +67,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     rpm-file-permissions && \
     /usr/libexec/mysqld -V | grep -qe "$MYSQL_VERSION\." && echo "Found VERSION $MYSQL_VERSION"
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]
diff --git a/8.0/Dockerfile.c9s b/8.0/Dockerfile.c9s
index 40a7b202..ebd67087 100644
--- a/8.0/Dockerfile.c9s
+++ b/8.0/Dockerfile.c9s
@@ -53,6 +53,11 @@ COPY 8.0/root-common /
 COPY 8.0/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 8.0/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -62,10 +67,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     rpm-file-permissions && \
     /usr/libexec/mysqld -V | grep -qe "$MYSQL_VERSION\." && echo "Found VERSION $MYSQL_VERSION"
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]
diff --git a/8.0/Dockerfile.fedora b/8.0/Dockerfile.fedora
index 131f2d6a..e66ebc3d 100644
--- a/8.0/Dockerfile.fedora
+++ b/8.0/Dockerfile.fedora
@@ -57,6 +57,11 @@ COPY 8.0/root-common /
 COPY 8.0/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 8.0/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -66,10 +71,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     rpm-file-permissions && \
     /usr/libexec/mysqld -V | grep -qe "$MYSQL_VERSION\." && echo "Found VERSION $MYSQL_VERSION"
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]
diff --git a/8.0/Dockerfile.rhel7 b/8.0/Dockerfile.rhel7
index 0986c764..c5a89676 100644
--- a/8.0/Dockerfile.rhel7
+++ b/8.0/Dockerfile.rhel7
@@ -63,6 +63,11 @@ COPY 8.0/root-common /
 COPY 8.0/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 8.0/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -72,10 +77,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     rpm-file-permissions && \
     ${MYSQL_PREFIX}/libexec/mysqld -V | grep -qe "$MYSQL_VERSION\." && echo "Found VERSION $MYSQL_VERSION"
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]
diff --git a/8.0/Dockerfile.rhel8 b/8.0/Dockerfile.rhel8
index ba2f62ae..42c1cec5 100644
--- a/8.0/Dockerfile.rhel8
+++ b/8.0/Dockerfile.rhel8
@@ -54,6 +54,11 @@ COPY 8.0/root-common /
 COPY 8.0/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 8.0/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -63,10 +68,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     rpm-file-permissions && \
     /usr/libexec/mysqld -V | grep -qe "$MYSQL_VERSION\." && echo "Found VERSION $MYSQL_VERSION"
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]
diff --git a/8.0/Dockerfile.rhel9 b/8.0/Dockerfile.rhel9
index 80a16c79..83f49e3e 100644
--- a/8.0/Dockerfile.rhel9
+++ b/8.0/Dockerfile.rhel9
@@ -53,6 +53,11 @@ COPY 8.0/root-common /
 COPY 8.0/s2i-common/bin/ $STI_SCRIPTS_PATH
 COPY 8.0/root /
 
+# Hard links are not supported in Testing Farm approach during sync to guest
+# operation system. Therefore tests are failing on error
+# /usr/libexec/s2i/run no such file or directory
+RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+
 # this is needed due to issues with squash
 # when this directory gets rm'd by the container-setup
 # script.
@@ -62,10 +67,6 @@ RUN rm -rf /etc/my.cnf.d/* && \
     rpm-file-permissions && \
     /usr/libexec/mysqld -V | grep -qe "$MYSQL_VERSION\." && echo "Found VERSION $MYSQL_VERSION"
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/var/lib/mysql/data"]
-
 USER 27
 
 ENTRYPOINT ["container-entrypoint"]
diff --git a/s2i-common/bin/run b/s2i-common/bin/run
deleted file mode 120000
index 4b21ab59..00000000
--- a/s2i-common/bin/run
+++ /dev/null
@@ -1 +0,0 @@
-/bin/run-mysqld
\ No newline at end of file