diff --git a/apps/api/fly.toml b/apps/api/fly.toml
deleted file mode 100644
index 6075447..0000000
--- a/apps/api/fly.toml
+++ /dev/null
@@ -1,41 +0,0 @@
-app = "mally-api"
-kill_signal = "SIGINT"
-kill_timeout = 5
-primary_region = "gig"
-processes = []
-
-[env]
-PORT = "8080"
-
-[experimental]
-auto_rollback = true
-
-[[services]]
-http_checks = []
-internal_port = 8080
-processes = ["app"]
-protocol = "tcp"
-script_checks = []
-[services.concurrency]
-hard_limit = 25
-soft_limit = 20
-type = "connections"
-
-[[services.ports]]
-force_https = true
-handlers = ["http"]
-port = 80
-
-[[services.ports]]
-handlers = ["tls", "http"]
-port = 443
-
-[[services.tcp_checks]]
-grace_period = "1s"
-interval = "15s"
-restart_limit = 0
-timeout = "2s"
-
-[[vm]]
-size = "shared-cpu-2x"
-memory = "512mb"
diff --git a/apps/api/pom.xml b/apps/api/pom.xml
index 6f8f090..a8a9848 100644
--- a/apps/api/pom.xml
+++ b/apps/api/pom.xml
@@ -100,19 +100,9 @@
 			<version>0.12.0</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.cache</groupId>
-			<artifactId>cache-api</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.hazelcast</groupId>
-			<artifactId>hazelcast-spring</artifactId>
-			<version>5.5.0</version>
-		</dependency>
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<scope>runtime</scope>
+			<groupId>org.ehcache</groupId>
+			<artifactId>ehcache</artifactId>
+			<classifier>jakarta</classifier>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/apps/api/src/main/resources/application.prod.yml b/apps/api/src/main/resources/application.prod.yml
index 486e52b..fc2179d 100644
--- a/apps/api/src/main/resources/application.prod.yml
+++ b/apps/api/src/main/resources/application.prod.yml
@@ -12,8 +12,7 @@ spring:
 
     cache:
         jcache:
-            provider: com.hazelcast.cache.impl.HazelcastServerCachingProvider
-            config: classpath:hazelcast.xml
+          config: classpath:ehcache.xml
 
     security:
         oauth2:
@@ -30,40 +29,48 @@ bucket4j:
           cache-name: buckets
           http-response-body: '{ "status": "error", "message": "Too many requests", "data": null, "errors": [] }'
           url: /url-shortener/redirect/.*
+          http-response-headers:
+            Access-Control-Allow-Origin: ${FRONTEND_URL}
           rate-limits:
               - cache-key: getRemoteAddr()
                 bandwidths:
-                    - capacity: 20
+                    - capacity: 50
                       time: 1
                       unit: minutes
         - id: url_shortener_shorten
           cache-name: buckets
           http-response-body: '{ "status": "error", "message": "Too many requests", "data": null, "errors": [] }'
           url: /url-shortener/shorten
+          http-response-headers:
+            Access-Control-Allow-Origin: ${FRONTEND_URL}
           rate-limits:
               - cache-key: getRemoteAddr()
                 bandwidths:
-                    - capacity: 10
+                    - capacity: 30
                       time: 1
                       unit: hours
         - id: pastebin_get_paste
           cache-name: buckets
           http-response-body: '{ "status": "error", "message": "Too many requests", "data": null, "errors": [] }'
           url: /pastebin/paste/.*
+          http-response-headers:
+            Access-Control-Allow-Origin: ${FRONTEND_URL}
           rate-limits:
               - cache-key: getRemoteAddr()
                 bandwidths:
-                    - capacity: 20
+                    - capacity: 50
                       time: 1
                       unit: minutes
         - id: pastebin_paste
           cache-name: buckets
           http-response-body: '{ "status": "error", "message": "Too many requests", "data": null, "errors": [] }'
           url: /url-shortener/shorten
+          http-response-headers:
+            Access-Control-Allow-Origin: ${FRONTEND_URL}
           rate-limits:
               - cache-key: getRemoteAddr()
                 bandwidths:
-                    - capacity: 10
+                    - capacity: 30
                       time: 1
                       unit: hours
 
diff --git a/apps/api/src/main/resources/application.testing.yml b/apps/api/src/main/resources/application.testing.yml
index 231fd64..0398193 100644
--- a/apps/api/src/main/resources/application.testing.yml
+++ b/apps/api/src/main/resources/application.testing.yml
@@ -12,8 +12,7 @@ spring:
 
     cache:
         jcache:
-            provider: com.hazelcast.cache.impl.HazelcastServerCachingProvider
-            config: classpath:hazelcast.xml
+            config: classpath:ehcache.xml
 
     security:
         oauth2:
diff --git a/apps/api/src/main/resources/application.yml b/apps/api/src/main/resources/application.yml
index 21fb528..2b29ae7 100644
--- a/apps/api/src/main/resources/application.yml
+++ b/apps/api/src/main/resources/application.yml
@@ -12,8 +12,7 @@ spring:
 
     cache:
         jcache:
-            provider: com.hazelcast.cache.impl.HazelcastServerCachingProvider
-            config: classpath:hazelcast.xml
+            config: classpath:ehcache.xml
 
     security:
       oauth2:
diff --git a/apps/api/src/main/resources/ehcache.xml b/apps/api/src/main/resources/ehcache.xml
new file mode 100644
index 0000000..e0244cb
--- /dev/null
+++ b/apps/api/src/main/resources/ehcache.xml
@@ -0,0 +1,17 @@
+<config xmlns='http://www.ehcache.org/v3'
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns:jsr107="http://www.ehcache.org/v3/jsr107"
+        xsi:schemaLocation="http://www.ehcache.org/v3 http://www.ehcache.org/schema/ehcache-core-3.0.xsd
+							http://www.ehcache.org/v3/jsr107 http://www.ehcache.org/schema/ehcache-107-ext-3.0.xsd">
+    <cache alias="buckets">
+        <expiry>
+            <ttl unit="seconds">3600</ttl>
+        </expiry>
+        <heap unit="entries">1000000</heap>
+        <jsr107:mbeans enable-statistics="true"/>
+    </cache>
+    <cache alias="filterConfigCache">
+        <heap unit="entries">1000000</heap>
+        <jsr107:mbeans enable-statistics="true"/>
+    </cache>
+</config>
\ No newline at end of file
diff --git a/apps/api/src/main/resources/hazelcast.xml b/apps/api/src/main/resources/hazelcast.xml
deleted file mode 100644
index ca83378..0000000
--- a/apps/api/src/main/resources/hazelcast.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<hazelcast
-        xsi:schemaLocation="https://www.hazelcast.com/schema/config hazelcast-config-5.1.xsd"
-        xmlns="http://www.hazelcast.com/schema/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <cache name="buckets">
-        <management-enabled>true</management-enabled>
-
-    </cache>
-    <cache name="filterConfigCache">
-        <management-enabled>true</management-enabled>
-    </cache>
-
-    <network>
-        <join>
-            <tcp-ip enabled="true">
-                <interface>127.0.0.1</interface>
-            </tcp-ip>
-        </join>
-    </network>
-</hazelcast>
\ No newline at end of file