diff --git a/ansible/playbook_systools.yml b/ansible/playbook_systools.yml
index 0444b31..b757299 100644
--- a/ansible/playbook_systools.yml
+++ b/ansible/playbook_systools.yml
@@ -33,7 +33,7 @@
     - name: Set root-only executable permissions for specific tools
       ansible.builtin.file:
         path: /usr/local/bin/{{ item }}
-        mode: '0750'
+        mode: '0700'
       loop:
         - open_volume
         - read_system_id
diff --git a/ansible/roles/encryption/files/aws-encryption-provider b/ansible/roles/encryption/files/aws-encryption-provider
deleted file mode 100755
index 198f127..0000000
Binary files a/ansible/roles/encryption/files/aws-encryption-provider and /dev/null differ
diff --git a/ansible/roles/encryption/files/open_volume b/ansible/roles/encryption/files/open_volume
deleted file mode 100644
index d72ac22..0000000
--- a/ansible/roles/encryption/files/open_volume
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-if [ "$#" -ne 3 ]; then
-    echo "Usage: $0 <keyserver>" "<image>" "<device>"
-    echo "Example: $0 https://keyserver.example.com /path/to/image.img <device>"
-    echo "Example: $0 https://keyserver.example.com /path/to/image.img /dev/mapper/crypt1"
-    exit 1
-fi
-
-KEYSERVER=$1
-IMAGE=$2
-DEVICE=$3
-
-if [ ! -e $IMAGE ]; then
-    logger "open_volume: ($DEVICE) Image file not found"
-    exit 1
-fi
-
-# if keyserver is not reachable, exit
-if ! curl -s -I $KEYSERVER > /dev/null; then
-    logger "open_volume: ($DEVICE) Key server not reachable, exiting."
-    exit 1
-fi
-
-# If device is already open, exit
-if [ -e /dev/mapper/$DEVICE ]; then
-    echo "open_volume: ($DEVICE) Device already open, exiting."
-    exit 1
-fi
-
-uuid=$(cat /proc/cpuinfo | grep 'model name' | head -1)
-uuid+=$(ip link show eth0 | grep ether | awk '{print $2}')
-uuid+=$(sudo dmidecode -s system-uuid)
-KEYID=$(echo -n "$uuid" | md5sum | awk '{print $1}')
-
-logger "open_volume: ($DEVICE) Downloading key from key server,"
-LOCALKEYFILE=$(mktemp)
-curl -s -o $LOCALKEYFILE $KEYSERVER/$KEYID
-if [ $? -ne 0 ]; then
-    logger "open_volume: ($DEVICE) Failed to download key from key server"
-    rm $LOCALKEYFILE
-    exit 1
-fi
-logger "open_volume:'$DEVICE' Key downloaded successfully, opening volume"
-/usr/sbin/cryptsetup luksOpen $IMAGE $DEVICE -d $LOCALKEYFILE
-if [ $? -ne 0 ]; then
-    logger "open_volume: ($DEVICE) Failed to open volume"
-    rm $LOCALKEYFILE
-    exit 1
-fi
-logger "open_volume: ($DEVICE) Volume opened successfully, removing key file"
-rm $LOCALKEYFILE
-exit 0
\ No newline at end of file
diff --git a/ansible/roles/encryption/files/read_system_id b/ansible/roles/encryption/files/read_system_id
deleted file mode 100644
index 1127671..0000000
--- a/ansible/roles/encryption/files/read_system_id
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-uuid=$(cat /proc/cpuinfo | grep 'model name' | head -1)
-uuid+=$(ip link show eth0 | grep ether | awk '{print $2}')
-uuid+=$(sudo dmidecode -s system-uuid)
-echo -n "$uuid" | md5sum | awk '{print $1}'
\ No newline at end of file
diff --git a/ansible/roles/encryption/files/start_encryption_provider b/ansible/roles/encryption/files/start_encryption_provider
deleted file mode 100644
index 60ae6d6..0000000
--- a/ansible/roles/encryption/files/start_encryption_provider
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-#!/bin/bash
-if [ "$#" -lt 1 ]; then
-    echo "Usage: $0 <keyserver>" "[socket]"
-    echo "Example: $0 https://keyserver.example.com"
-    echo "Example: $0 https://keyserver.example.com /var/run/kmsplugin/socket.sock"
-    exit 1
-fi
-
-KEYSERVER=$1
-SOCKET=${2:-/var/run/kmsplugin/socket.sock}
-
-# if keyserver is not reachable, exit
-if ! curl -s -I $KEYSERVER > /dev/null; then
-    logger "start_encryption_provider: Key server not reachable, exiting."
-    exit 1
-fi
-
-uuid=$(cat /proc/cpuinfo | grep 'model name' | head -1)
-uuid+=$(ip link show eth0 | grep ether | awk '{print $2}')
-uuid+=$(sudo dmidecode -s system-uuid)
-KEYID=$(echo -n "$uuid" | md5sum | awk '{print $1}')
-
-logger "start_encryption_provider: Downloading key from key server,"
-LOCALKEYFILE=$(mktemp)
-curl -s -o $LOCALKEYFILE $KEYSERVER/$KEYID-encryption-service-credentials.json
-if [ $? -ne 0 ]; then
-    logger "start_encryption_provider: Failed to download key from key server"
-    rm $LOCALKEYFILE
-    exit 1
-fi
-
-logger "start_encryption_provider: Key downloaded successfully, extracting credentials"
-export AWS_ACCESS_KEY_ID=$(jq -r '.access_key' $LOCALKEYFILE)
-if [ $? -ne 0 ]; then
-    logger "start_encryption_provider: Failed to extract AWS credentials from key file"
-    rm $LOCALKEYFILE
-    exit 1
-fi
-
-export AWS_SECRET_ACCESS_KEY=$(jq -r '.secret_key' $LOCALKEYFILE)
-if [ $? -ne 0 ]; then
-    logger "start_encryption_provider: Failed to extract AWS credentials from key file"
-    rm $LOCALKEYFILE
-    exit 1
-fi
-KEYARN=$(jq -r '.key_arn' $LOCALKEYFILE)
-if [ $? -ne 0 ]; then
-    logger "start_encryption_provider: Failed to extract KMS key ARN from key file"
-    rm $LOCALKEYFILE
-    exit 1
-fi
-REGION=$(jq -r '.region' $LOCALKEYFILE)
-if [ $? -ne 0 ]; then
-    logger "start_encryption_provider: Failed to extract region from key file"
-    rm $LOCALKEYFILE
-    exit 1
-fi
-
-logger "start_encryption_provider: Removing key file"
-rm $LOCALKEYFILE
-
-logger "start_encryption_provider: Starting encryption provider"
-mkdir {{ encryption_kms_socket_dir | dirname }} }} 2>/dev/null || true
-chmod 700 {{ encryption_kms_socket_dir | dirname }} 2>/dev/null
-
-if [ ! -f /usr/local/bin/aws-encryption-provider ]; then
-    logger "start_encryption_provider: Encryption provider not found, exiting."
-    exit 1
-fi
-
-/usr/local/bin/aws-encryption-provider --key=$KEYARN --region=$REGION --listen=$SOCKET
-if [ $? -ne 0 ]; then
-    logger "start_encryption_provider: Failed to start encryption provider"
-    exit 1
-fi
-exit 0
diff --git a/ansible/roles/encryption/tasks/kms.yml b/ansible/roles/encryption/tasks/kms.yml
index 3dc5f27..32f41c5 100644
--- a/ansible/roles/encryption/tasks/kms.yml
+++ b/ansible/roles/encryption/tasks/kms.yml
@@ -1,10 +1,3 @@
-- name: Copy aws-encryption-provider binary to the host
-  become: true
-  ansible.builtin.copy:
-    src: aws-encryption-provider
-    dest: /usr/local/bin/aws-encryption-provider
-    mode: "0755"
-
 - name: Create KMS socket directory
   become: true
   ansible.builtin.file:
diff --git a/ansible/roles/encryption/templates/aws-encryption-provider.service.j2 b/ansible/roles/encryption/templates/aws-encryption-provider.service.j2
index bdda027..7ac9342 100644
--- a/ansible/roles/encryption/templates/aws-encryption-provider.service.j2
+++ b/ansible/roles/encryption/templates/aws-encryption-provider.service.j2
@@ -5,7 +5,7 @@ Before=snap.microk8s.daemon-kubelite.service
 
 [Service]
 Type=simple
-ExecStart=/usr/local/bin/start_encryption_provider "{{ key_server }}" "{{ encryption_kms_socket }}"
+ExecStart=/usr/local/bin/k8s_encryption_provider "{{ key_server }}" "{{ encryption_kms_socket }}"
 Restart=on-failure
 User=root