diff --git a/10/Dockerfile.c8s b/10/Dockerfile.c8s
index 9aff4d3e..9692cd70 100644
--- a/10/Dockerfile.c8s
+++ b/10/Dockerfile.c8s
@@ -60,6 +60,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 # Not using VOLUME statement since it's not working in OpenShift Online:
 # https://github.com/sclorg/httpd-container/issues/30
 # VOLUME ["/var/lib/pgsql/data"]
diff --git a/10/Dockerfile.rhel7 b/10/Dockerfile.rhel7
index acb94437..02d8cd1a 100644
--- a/10/Dockerfile.rhel7
+++ b/10/Dockerfile.rhel7
@@ -63,6 +63,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 # When bash is started non-interactively, to run a shell script, for example it
 # looks for this variable and source the content of this file. This will enable
 # the SCL for all scripts without need to do 'scl enable'.
diff --git a/10/Dockerfile.rhel8 b/10/Dockerfile.rhel8
index e188c7e5..236e488b 100644
--- a/10/Dockerfile.rhel8
+++ b/10/Dockerfile.rhel8
@@ -61,6 +61,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 # Not using VOLUME statement since it's not working in OpenShift Online:
 # https://github.com/sclorg/httpd-container/issues/30
 # VOLUME ["/var/lib/pgsql/data"]
diff --git a/10/s2i/bin/run b/10/s2i/bin/run
deleted file mode 120000
index a7f4076b..00000000
--- a/10/s2i/bin/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/run-postgresql
\ No newline at end of file
diff --git a/12/Dockerfile.c8s b/12/Dockerfile.c8s
index 946cd278..08da9e1b 100644
--- a/12/Dockerfile.c8s
+++ b/12/Dockerfile.c8s
@@ -61,6 +61,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 # Not using VOLUME statement since it's not working in OpenShift Online:
 # https://github.com/sclorg/httpd-container/issues/30
 # VOLUME ["/var/lib/pgsql/data"]
diff --git a/12/Dockerfile.fedora b/12/Dockerfile.fedora
index f596e65f..f5ce3586 100644
--- a/12/Dockerfile.fedora
+++ b/12/Dockerfile.fedora
@@ -62,6 +62,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 VOLUME ["/var/lib/pgsql/data"]
 
 # S2I permission fixes
diff --git a/12/Dockerfile.rhel7 b/12/Dockerfile.rhel7
index 75e7b688..8d62190b 100644
--- a/12/Dockerfile.rhel7
+++ b/12/Dockerfile.rhel7
@@ -64,6 +64,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 # When bash is started non-interactively, to run a shell script, for example it
 # looks for this variable and source the content of this file. This will enable
 # the SCL for all scripts without need to do 'scl enable'.
diff --git a/12/Dockerfile.rhel8 b/12/Dockerfile.rhel8
index e83fd4fe..9c8aa1e5 100644
--- a/12/Dockerfile.rhel8
+++ b/12/Dockerfile.rhel8
@@ -62,6 +62,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 # Not using VOLUME statement since it's not working in OpenShift Online:
 # https://github.com/sclorg/httpd-container/issues/30
 # VOLUME ["/var/lib/pgsql/data"]
diff --git a/12/s2i/bin/run b/12/s2i/bin/run
deleted file mode 120000
index a7f4076b..00000000
--- a/12/s2i/bin/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/run-postgresql
\ No newline at end of file
diff --git a/13/Dockerfile.c8s b/13/Dockerfile.c8s
index 60130b92..49a2f789 100644
--- a/13/Dockerfile.c8s
+++ b/13/Dockerfile.c8s
@@ -61,6 +61,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 # Not using VOLUME statement since it's not working in OpenShift Online:
 # https://github.com/sclorg/httpd-container/issues/30
 # VOLUME ["/var/lib/pgsql/data"]
diff --git a/13/Dockerfile.c9s b/13/Dockerfile.c9s
index 65bdb635..a868fb13 100644
--- a/13/Dockerfile.c9s
+++ b/13/Dockerfile.c9s
@@ -60,6 +60,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 # Not using VOLUME statement since it's not working in OpenShift Online:
 # https://github.com/sclorg/httpd-container/issues/30
 # VOLUME ["/var/lib/pgsql/data"]
diff --git a/13/Dockerfile.fedora b/13/Dockerfile.fedora
index 7031f394..aa7f63a6 100644
--- a/13/Dockerfile.fedora
+++ b/13/Dockerfile.fedora
@@ -62,6 +62,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 VOLUME ["/var/lib/pgsql/data"]
 
 # S2I permission fixes
diff --git a/13/Dockerfile.rhel7 b/13/Dockerfile.rhel7
index 93939459..03d27cc0 100644
--- a/13/Dockerfile.rhel7
+++ b/13/Dockerfile.rhel7
@@ -64,6 +64,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 # When bash is started non-interactively, to run a shell script, for example it
 # looks for this variable and source the content of this file. This will enable
 # the SCL for all scripts without need to do 'scl enable'.
diff --git a/13/Dockerfile.rhel8 b/13/Dockerfile.rhel8
index 986c1e67..38e3b951 100644
--- a/13/Dockerfile.rhel8
+++ b/13/Dockerfile.rhel8
@@ -62,6 +62,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 # Not using VOLUME statement since it's not working in OpenShift Online:
 # https://github.com/sclorg/httpd-container/issues/30
 # VOLUME ["/var/lib/pgsql/data"]
diff --git a/13/Dockerfile.rhel9 b/13/Dockerfile.rhel9
index 50b91331..063ec1f4 100644
--- a/13/Dockerfile.rhel9
+++ b/13/Dockerfile.rhel9
@@ -62,6 +62,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 # Not using VOLUME statement since it's not working in OpenShift Online:
 # https://github.com/sclorg/httpd-container/issues/30
 # VOLUME ["/var/lib/pgsql/data"]
diff --git a/13/s2i/bin/run b/13/s2i/bin/run
deleted file mode 120000
index a7f4076b..00000000
--- a/13/s2i/bin/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/run-postgresql
\ No newline at end of file
diff --git a/14/Dockerfile.fedora b/14/Dockerfile.fedora
index 6cc888ee..a1ece9c2 100644
--- a/14/Dockerfile.fedora
+++ b/14/Dockerfile.fedora
@@ -62,6 +62,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 VOLUME ["/var/lib/pgsql/data"]
 
 # S2I permission fixes
diff --git a/14/s2i/bin/run b/14/s2i/bin/run
deleted file mode 120000
index a7f4076b..00000000
--- a/14/s2i/bin/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/run-postgresql
\ No newline at end of file
diff --git a/15/Dockerfile.c8s b/15/Dockerfile.c8s
index 9dbb7809..8579ca0c 100644
--- a/15/Dockerfile.c8s
+++ b/15/Dockerfile.c8s
@@ -61,6 +61,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 # Not using VOLUME statement since it's not working in OpenShift Online:
 # https://github.com/sclorg/httpd-container/issues/30
 # VOLUME ["/var/lib/pgsql/data"]
diff --git a/15/Dockerfile.c9s b/15/Dockerfile.c9s
index 7d8fcba8..378ea8f3 100644
--- a/15/Dockerfile.c9s
+++ b/15/Dockerfile.c9s
@@ -60,6 +60,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 # Not using VOLUME statement since it's not working in OpenShift Online:
 # https://github.com/sclorg/httpd-container/issues/30
 # VOLUME ["/var/lib/pgsql/data"]
diff --git a/15/Dockerfile.fedora b/15/Dockerfile.fedora
index 762cfbb1..560e3bd6 100644
--- a/15/Dockerfile.fedora
+++ b/15/Dockerfile.fedora
@@ -62,6 +62,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 VOLUME ["/var/lib/pgsql/data"]
 
 # S2I permission fixes
diff --git a/15/Dockerfile.rhel8 b/15/Dockerfile.rhel8
index b68f9781..76a568c0 100644
--- a/15/Dockerfile.rhel8
+++ b/15/Dockerfile.rhel8
@@ -62,6 +62,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 # Not using VOLUME statement since it's not working in OpenShift Online:
 # https://github.com/sclorg/httpd-container/issues/30
 # VOLUME ["/var/lib/pgsql/data"]
diff --git a/15/Dockerfile.rhel9 b/15/Dockerfile.rhel9
index 51d003e1..c464d0b5 100644
--- a/15/Dockerfile.rhel9
+++ b/15/Dockerfile.rhel9
@@ -62,6 +62,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 # Not using VOLUME statement since it's not working in OpenShift Online:
 # https://github.com/sclorg/httpd-container/issues/30
 # VOLUME ["/var/lib/pgsql/data"]
diff --git a/15/s2i/bin/run b/15/s2i/bin/run
deleted file mode 120000
index a7f4076b..00000000
--- a/15/s2i/bin/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/run-postgresql
\ No newline at end of file
diff --git a/16/Dockerfile.c8s b/16/Dockerfile.c8s
index 8322aa49..0498931d 100644
--- a/16/Dockerfile.c8s
+++ b/16/Dockerfile.c8s
@@ -61,6 +61,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 # Not using VOLUME statement since it's not working in OpenShift Online:
 # https://github.com/sclorg/httpd-container/issues/30
 # VOLUME ["/var/lib/pgsql/data"]
diff --git a/16/Dockerfile.c9s b/16/Dockerfile.c9s
index 21e159cb..91b16096 100644
--- a/16/Dockerfile.c9s
+++ b/16/Dockerfile.c9s
@@ -60,6 +60,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 # Not using VOLUME statement since it's not working in OpenShift Online:
 # https://github.com/sclorg/httpd-container/issues/30
 # VOLUME ["/var/lib/pgsql/data"]
diff --git a/16/Dockerfile.fedora b/16/Dockerfile.fedora
index 0a17e06b..9c0bb6f0 100644
--- a/16/Dockerfile.fedora
+++ b/16/Dockerfile.fedora
@@ -61,6 +61,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 VOLUME ["/var/lib/pgsql/data"]
 
 # S2I permission fixes
diff --git a/16/Dockerfile.rhel8 b/16/Dockerfile.rhel8
index eb806267..70be99fe 100644
--- a/16/Dockerfile.rhel8
+++ b/16/Dockerfile.rhel8
@@ -62,6 +62,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 # Not using VOLUME statement since it's not working in OpenShift Online:
 # https://github.com/sclorg/httpd-container/issues/30
 # VOLUME ["/var/lib/pgsql/data"]
diff --git a/16/Dockerfile.rhel9 b/16/Dockerfile.rhel9
index c1dddd52..bc1009b5 100644
--- a/16/Dockerfile.rhel9
+++ b/16/Dockerfile.rhel9
@@ -62,6 +62,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 # Not using VOLUME statement since it's not working in OpenShift Online:
 # https://github.com/sclorg/httpd-container/issues/30
 # VOLUME ["/var/lib/pgsql/data"]
diff --git a/16/s2i/bin/run b/16/s2i/bin/run
deleted file mode 120000
index a7f4076b..00000000
--- a/16/s2i/bin/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/run-postgresql
\ No newline at end of file
diff --git a/manifest.yml b/manifest.yml
index 44fb951f..fbbe1996 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -101,7 +101,3 @@ SYMLINK_RULES:
 
   - src: ../test
     dest: test
-
-  - src: /usr/bin/run-postgresql
-    dest: s2i/bin/run
-    check_symlink: false  # Disable check of dead symlinks
diff --git a/src/Dockerfile b/src/Dockerfile
index a63d00ea..7f84f3b6 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -96,6 +96,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 {% if spec.prod != "rhel8" and spec.prod != "rhel9" and config.os.id != "fedora" and spec.prod != "c8s" and spec.prod != "c9s" %}
 # When bash is started non-interactively, to run a shell script, for example it
 # looks for this variable and source the content of this file. This will enable
diff --git a/src/Dockerfile.fedora b/src/Dockerfile.fedora
index ad8e03ef..48accf6f 100644
--- a/src/Dockerfile.fedora
+++ b/src/Dockerfile.fedora
@@ -77,6 +77,11 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql
 COPY root /
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
+# 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 /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run
+
 VOLUME ["/var/lib/pgsql/data"]
 
 # S2I permission fixes
diff --git a/src/s2i/bin/run b/src/s2i/bin/run
deleted file mode 120000
index a7f4076b..00000000
--- a/src/s2i/bin/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/run-postgresql
\ No newline at end of file