diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 53479599..3892cb90 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -44,7 +44,6 @@ jobs:
         working-directory: deployments/docker-swarm-terraform
         env:
           CPU_LIMIT: ${{ vars.CPU_LIMIT }}
-          MEMORY_LIMIT: ${{ vars.MEMORY_LIMIT }}
         run: |
           eval "$(ssh-agent -s)"
           ssh-add <(echo "${{ secrets.SSH_PRIVATE_KEY }}")
@@ -54,4 +53,5 @@ jobs:
           -var "app-version=${{ needs.build.outputs.app-version }}" \
           -var 'app-host=${{ secrets.APP_HOST }}' \
           -var "app-config-b64=${{ secrets.APP_CONFIG_B64 }}" \
-          -var "app-env-json-b64=${{ secrets.APP_ENV_JSON_B64 }}"
+          -var "app-env-json-b64=${{ secrets.APP_ENV_JSON_B64 }}" \
+          -var "memory-limit=${{ vars.MEMORY_LIMIT }}"
diff --git a/deployments/docker-swarm-terraform/main.tf b/deployments/docker-swarm-terraform/main.tf
index 5039e027..e288c862 100644
--- a/deployments/docker-swarm-terraform/main.tf
+++ b/deployments/docker-swarm-terraform/main.tf
@@ -54,7 +54,7 @@ resource "docker_service" "app" {
       }
 
       reservation {
-        memory_bytes = 16 * 1024 * 1024
+        memory_bytes = 32 * 1024 * 1024
       }
     }
   }
diff --git a/deployments/docker-swarm-terraform/variables.tf b/deployments/docker-swarm-terraform/variables.tf
index 6b95e982..cd7f3e54 100644
--- a/deployments/docker-swarm-terraform/variables.tf
+++ b/deployments/docker-swarm-terraform/variables.tf
@@ -35,6 +35,6 @@ variable "app-env-json-b64" {
 variable "memory-limit" {
   type        = number
   description = "Memory limit in bytes"
-  default     = 32 * 1024 * 1024
+  default     = 64 * 1024 * 1024
 }
 
diff --git a/internal/sms-gateway/repositories/messages.go b/internal/sms-gateway/repositories/messages.go
index c32efce6..e09d308d 100644
--- a/internal/sms-gateway/repositories/messages.go
+++ b/internal/sms-gateway/repositories/messages.go
@@ -22,7 +22,8 @@ type MessagesRepository struct {
 func (r *MessagesRepository) SelectPending(deviceID string) (messages []models.Message, err error) {
 	err = r.db.
 		Where("device_id = ? AND state = ?", deviceID, models.ProcessingStatePending).
-		Order("id").
+		Order("id DESC").
+		Limit(100).
 		Preload("Recipients").
 		Find(&messages).
 		Error