diff --git a/pom.xml b/pom.xml
index 0474f97a0..78dab9e85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-operator</artifactId>
-    <version>5.63.22</version>
+    <version>5.63.36-alpha-218-SNAPSHOT</version>
   
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/scripts/aws/Dockerfile b/scripts/aws/Dockerfile
index 67aa17368..7a720a331 100644
--- a/scripts/aws/Dockerfile
+++ b/scripts/aws/Dockerfile
@@ -20,7 +20,7 @@ COPY ./syslog-ng-ose-pub.asc /app/dep/
 
 RUN echo "deb http://security.ubuntu.com/ubuntu focal-security main" | tee -a /etc/apt/sources.list \
     && apt update -y \
-    && apt install -y pkg-config libssl-dev libssl1.1 net-tools curl jq netcat python3 python3-pip libcap2 libivykis0 libjson-c5 libnet1 libwrap0 \
+    && apt install -y pkg-config libssl-dev libssl1.1 net-tools curl jq netcat python3 python3-pip libcap2 libivykis0 libjson-c5 libnet1 libwrap0 cron \
     && apt-key add /app/dep/syslog-ng-ose-pub.asc \
     && apt-get install /app/dep/syslog-ng-core_4.6.0-1_amd64.deb \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/scripts/aws/config-server/app.py b/scripts/aws/config-server/app.py
index c0c94fc63..d94857ada 100644
--- a/scripts/aws/config-server/app.py
+++ b/scripts/aws/config-server/app.py
@@ -1,4 +1,5 @@
 from flask import Flask
+from datetime import datetime, timezone
 import json
 import os
 
@@ -14,5 +15,12 @@ def get_config():
     except Exception as e:
         return str(e), 500
 
+@app.route('/getCurrentTime', methods=['GET'])
+def get_time():
+    try:
+        return datetime.now(timezone.utc).isoformat(timespec="seconds")
+    except Exception as e:
+        return str(e), 500
+
 if __name__ == '__main__':
     app.run(processes=8)
diff --git a/scripts/aws/entrypoint.sh b/scripts/aws/entrypoint.sh
index 6d4fbe15e..703e4a0d0 100755
--- a/scripts/aws/entrypoint.sh
+++ b/scripts/aws/entrypoint.sh
@@ -22,6 +22,20 @@ ifconfig lo 127.0.0.1
 echo "Starting vsock proxy..."
 /app/vsockpx --config /app/proxies.nitro.yaml --daemon --workers $(( ( $(nproc) + 3 ) / 4 )) --log-level 3
 
+TIME_SYNC_URL="http://127.0.0.1:27015/getCurrentTime"
+TIME_SYNC_PROXY="socks5h://127.0.0.1:3305"
+
+install_time_sync_cron() {
+  mkdir -p /etc/cron.d
+  cat > /etc/cron.d/uid-time-sync <<EOF
+0 0 * * * root current_time=\$(curl -sSf -x "${TIME_SYNC_PROXY}" "${TIME_SYNC_URL}") && date -u -s "\${current_time}" && echo "Time sync: updated enclave time to \${current_time}" >>/home/start.txt 2>&1
+EOF
+  chmod 0644 /etc/cron.d/uid-time-sync
+  cron
+}
+
+install_time_sync_cron
+
 build_parameterized_config() {
   curl -s -f -o "${PARAMETERIZED_CONFIG}" -x socks5h://127.0.0.1:3305 http://127.0.0.1:27015/getConfig
   REQUIRED_KEYS=("optout_base_url" "core_base_url" "core_api_token" "optout_api_token" "environment" "uid_instance_id_prefix")
diff --git a/scripts/aws/uid2-operator-ami/ansible/playbook.yml b/scripts/aws/uid2-operator-ami/ansible/playbook.yml
index a5ec77809..a7222d04a 100644
--- a/scripts/aws/uid2-operator-ami/ansible/playbook.yml
+++ b/scripts/aws/uid2-operator-ami/ansible/playbook.yml
@@ -240,7 +240,7 @@
     ansible.builtin.systemd:
       name: uid2operator.service
       enabled: yes
-
+  
   - name: Clean up tmp files
     file:
       path: /tmp/artifacts