diff --git a/setup_openvpn.sh b/setup_openvpn.sh
old mode 100644
new mode 100755
index ac27923..ae9777e
--- a/setup_openvpn.sh
+++ b/setup_openvpn.sh
@@ -11,6 +11,7 @@ fi
 
 # Clean up any existing installation
 echo "Cleaning up any existing installation..."
+systemctl stop openvpn@server || true
 rm -rf /etc/openvpn/server/easy-rsa
 rm -rf /etc/openvpn/server/pki
 rm -f /etc/openvpn/server/*.crt
@@ -18,6 +19,13 @@ rm -f /etc/openvpn/server/*.key
 rm -f /etc/openvpn/server/*.pem
 rm -f /etc/openvpn/server/server.conf
 rm -f /etc/openvpn/server/generate-client.sh
+rm -rf /etc/openvpn/client/*
+
+# Verify cleanup
+if [ -d "/etc/openvpn/server/easy-rsa" ]; then
+    echo "Failed to remove easy-rsa directory. Please check permissions and try again."
+    exit 1
+fi
 
 # Update system
 echo "Updating system..."
@@ -35,7 +43,7 @@ mkdir -p /etc/openvpn/client
 
 # Copy easy-rsa files
 echo "Setting up easy-rsa..."
-make-cadir /etc/openvpn/server/easy-rsa
+cp -r /usr/share/easy-rsa/* /etc/openvpn/server/easy-rsa/
 cd /etc/openvpn/server/easy-rsa/
 
 # Initialize PKI