diff --git a/client/server_scripts/awg/configure_container.sh b/client/server_scripts/awg/configure_container.sh
index 2000c965..141f3b9a 100644
--- a/client/server_scripts/awg/configure_container.sh
+++ b/client/server_scripts/awg/configure_container.sh
@@ -1,13 +1,20 @@
 mkdir -p /opt/amnezia/awg
 cd /opt/amnezia/awg
-WIREGUARD_SERVER_PRIVATE_KEY=$(wg genkey)
-echo $WIREGUARD_SERVER_PRIVATE_KEY > /opt/amnezia/awg/wireguard_server_private_key.key
 
-WIREGUARD_SERVER_PUBLIC_KEY=$(echo $WIREGUARD_SERVER_PRIVATE_KEY | wg pubkey)
-echo $WIREGUARD_SERVER_PUBLIC_KEY > /opt/amnezia/awg/wireguard_server_public_key.key
+if [ ! -f /opt/amnezia/wireguard/wireguard_server_private_key.key ]; then
+    WIREGUARD_SERVER_PRIVATE_KEY=$(wg genkey)
+fi
+echo $WIREGUARD_SERVER_PRIVATE_KEY > /opt/amnezia/wireguard/wireguard_server_private_key.key
 
-WIREGUARD_PSK=$(wg genpsk)
-echo $WIREGUARD_PSK > /opt/amnezia/awg/wireguard_psk.key
+if [ ! -f /opt/amnezia/wireguard/wireguard_server_private_key.key ]; then
+    WIREGUARD_SERVER_PUBLIC_KEY=$(echo $WIREGUARD_SERVER_PRIVATE_KEY | wg pubkey)
+fi
+echo $WIREGUARD_SERVER_PUBLIC_KEY > /opt/amnezia/wireguard/wireguard_server_public_key.key
+
+if [ ! -f /opt/amnezia/wireguard/wireguard_psk.key ]; then
+    WIREGUARD_PSK=$(wg genpsk)
+fi
+echo $WIREGUARD_PSK > /opt/amnezia/wireguard/wireguard_psk.key
 
 cat > /opt/amnezia/awg/wg0.conf <<EOF
 [Interface]
diff --git a/client/server_scripts/awg/run_container.sh b/client/server_scripts/awg/run_container.sh
index af2a1e17..7b1b8d4e 100644
--- a/client/server_scripts/awg/run_container.sh
+++ b/client/server_scripts/awg/run_container.sh
@@ -1,3 +1,8 @@
+# Create docker volume if not exists
+if ! sudo docker volume ls | grep -q $CONTAINER_NAME; then
+    sudo docker volume create $CONTAINER_NAME
+fi
+
 # Run container
 sudo docker run -d \
 --log-driver none \
diff --git a/client/server_scripts/remove_all_containers.sh b/client/server_scripts/remove_all_containers.sh
index ce706f80..70b56332 100644
--- a/client/server_scripts/remove_all_containers.sh
+++ b/client/server_scripts/remove_all_containers.sh
@@ -2,4 +2,5 @@ sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker stop;\
 sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker rm -fv;\
 sudo docker images -a | grep amnezia | awk '{print $3}' | xargs sudo docker rmi;\
 sudo docker network ls | grep amnezia-dns-net | awk '{print $1}' | xargs sudo docker network rm;\
+sudo docker volume ls | grep amnezia | awk '{print $1}' | xargs sudo docker volume -f rm;\
 sudo rm -frd /opt/amnezia
diff --git a/client/server_scripts/remove_container.sh b/client/server_scripts/remove_container.sh
index 3e894e8f..d6e0a95f 100644
--- a/client/server_scripts/remove_container.sh
+++ b/client/server_scripts/remove_container.sh
@@ -1,3 +1,6 @@
 sudo docker stop $CONTAINER_NAME;\
 sudo docker rm -fv $CONTAINER_NAME;\
 sudo docker rmi $CONTAINER_NAME
+if sudo docker volume ls | grep -q $CONTAINER_NAME; then
+    sudo docker volume rm -f $CONTAINER_NAME
+fi
diff --git a/client/server_scripts/wireguard/configure_container.sh b/client/server_scripts/wireguard/configure_container.sh
index 58105d49..67f210a5 100644
--- a/client/server_scripts/wireguard/configure_container.sh
+++ b/client/server_scripts/wireguard/configure_container.sh
@@ -1,12 +1,19 @@
 mkdir -p /opt/amnezia/wireguard
 cd /opt/amnezia/wireguard
-WIREGUARD_SERVER_PRIVATE_KEY=$(wg genkey)
+
+if [ ! -f /opt/amnezia/wireguard/wireguard_server_private_key.key ]; then
+    WIREGUARD_SERVER_PRIVATE_KEY=$(wg genkey)
+fi
 echo $WIREGUARD_SERVER_PRIVATE_KEY > /opt/amnezia/wireguard/wireguard_server_private_key.key
 
-WIREGUARD_SERVER_PUBLIC_KEY=$(echo $WIREGUARD_SERVER_PRIVATE_KEY | wg pubkey)
+if [ ! -f /opt/amnezia/wireguard/wireguard_server_private_key.key ]; then
+    WIREGUARD_SERVER_PUBLIC_KEY=$(echo $WIREGUARD_SERVER_PRIVATE_KEY | wg pubkey)
+fi
 echo $WIREGUARD_SERVER_PUBLIC_KEY > /opt/amnezia/wireguard/wireguard_server_public_key.key
 
-WIREGUARD_PSK=$(wg genpsk)
+if [ ! -f /opt/amnezia/wireguard/wireguard_psk.key ]; then
+    WIREGUARD_PSK=$(wg genpsk)
+fi
 echo $WIREGUARD_PSK > /opt/amnezia/wireguard/wireguard_psk.key
 
 cat > /opt/amnezia/wireguard/wg0.conf <<EOF
diff --git a/client/server_scripts/wireguard/run_container.sh b/client/server_scripts/wireguard/run_container.sh
index 2520525a..d5474b40 100644
--- a/client/server_scripts/wireguard/run_container.sh
+++ b/client/server_scripts/wireguard/run_container.sh
@@ -1,3 +1,8 @@
+# Create docker volume if not exists
+if ! sudo docker volume ls | grep -q $CONTAINER_NAME; then
+    sudo docker volume create $CONTAINER_NAME
+fi
+
 # Run container
 sudo docker run -d \
 --log-driver none \
@@ -7,6 +12,7 @@ sudo docker run -d \
 --cap-add=SYS_MODULE \
 -p $WIREGUARD_SERVER_PORT:$WIREGUARD_SERVER_PORT/udp \
 -v /lib/modules:/lib/modules \
+-v $CONTAINER_NAME:/opt/amnezia \
 --sysctl="net.ipv4.conf.all.src_valid_mark=1" \
 --name $CONTAINER_NAME \
 $CONTAINER_NAME