diff --git a/roles/openshift-apps/fas/templates/buildconfig-yubikey.yml b/roles/openshift-apps/fas/templates/buildconfig-yubikey.yml
index 3c9b807845..ca34b30b2c 100644
--- a/roles/openshift-apps/fas/templates/buildconfig-yubikey.yml
+++ b/roles/openshift-apps/fas/templates/buildconfig-yubikey.yml
@@ -26,7 +26,11 @@ spec:
       RUN rm -f /usr/share/ykval/ykval-config.php && \
         rm -f /usr/share/ykksm/ykksm-config.php && \
         ln -sf /etc/ykksm/ykksm-config.php /usr/share/ykksm/ykksm-config.php && \
-        ln -sf /etc/ykval/ykval-config.php /usr/share/ykval/ykval-config.php
+        ln -sf /etc/ykval/ykval-config.php /usr/share/ykval/ykval-config.php && \
+        rm -f /usr/share/ykksm/ykksm-config.php && \
+        rm -f /usr/share/ykval/ykval-config.php && \
+        ln -sf /usr/share/ykksm/ykksm-config.php /etc/yubikey/ykksm-config.php && \
+        ln -sf /usr/share/ykval/ykval-config.php /etc/yubikey/ykval-config.php
 
       EXPOSE 8080
       ENTRYPOINT bash /etc/yubikey/start.sh