diff --git a/builder/dockerfile.centos_core.rpm.test b/builder/dockerfile.centos_core.rpm.test
index ec02208..0634c40 100644
--- a/builder/dockerfile.centos_core.rpm.test
+++ b/builder/dockerfile.centos_core.rpm.test
@@ -52,7 +52,7 @@ RUN yum localinstall -y /tmp/*.rpm
 ### END CUSTOM STUFF ###
 
 RUN chown -R 1000:0 $HOME
-USER 1000:kasmvnc
+USER 1000:kasmvnc-cert
 WORKDIR $HOME
 
 RUN mkdir ~/.vnc && echo '/usr/bin/xfce4-session &' >> ~/.vnc/xstartup && \
diff --git a/builder/dockerfile.fedora_thirtythree.rpm.test b/builder/dockerfile.fedora_thirtythree.rpm.test
index bdd4205..895bbc1 100644
--- a/builder/dockerfile.fedora_thirtythree.rpm.test
+++ b/builder/dockerfile.fedora_thirtythree.rpm.test
@@ -55,7 +55,7 @@ RUN dnf localinstall -y --allowerasing /tmp/*.rpm
 ### END CUSTOM STUFF ###
 
 RUN chown -R 1000:0 $HOME
-USER 1000:kasmvnc
+USER 1000:kasmvnc-cert
 WORKDIR $HOME
 
 RUN mkdir ~/.vnc && echo '/usr/bin/lxsession -s LXDE &' >> ~/.vnc/xstartup && \
diff --git a/centos/kasmvncserver.spec b/centos/kasmvncserver.spec
index 33d75d0..6e94979 100644
--- a/centos/kasmvncserver.spec
+++ b/centos/kasmvncserver.spec
@@ -24,7 +24,7 @@ cd $RPM_BUILD_ROOT/usr/bin && mv Xkasmvnc Xvnc && \
   ln -s kasmvncpasswd vncpasswd
 cd $RPM_BUILD_ROOT/usr/share/man/man1 && mv Xkasmvnc.1 Xvnc.1 && \
   mv kasmvncserver.1 vncserver.1 && mv kasmvncconfig.1 vncconfig.1 && \
-  mv kasmvncpasswd.1 vncpasswd.1
+  cp kasmvncpasswd.1 vncpasswd.1
 
 %files
 /usr/bin/*
@@ -39,7 +39,7 @@ cd $RPM_BUILD_ROOT/usr/share/man/man1 && mv Xkasmvnc.1 Xvnc.1 && \
 - Initial release of the rpm package.
 
 %post
-  kasmvnc_group="kasmvnc"
+  kasmvnc_group="kasmvnc-cert"
 
   create_kasmvnc_group() {
     if ! getent group "$kasmvnc_group" >/dev/null; then