diff --git a/ansible/roles/system/tasks/main.yml b/ansible/roles/system/tasks/main.yml
index 5f362d0f..5ca587af 100644
--- a/ansible/roles/system/tasks/main.yml
+++ b/ansible/roles/system/tasks/main.yml
@@ -197,6 +197,7 @@
   apt:
     name:
       - rpi-update
+      - bc
     state: latest
 
 - name: Remove deprecated apt dependencies
diff --git a/bin/install.sh b/bin/install.sh
index 1e35cc1e..5bd91d7b 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -141,6 +141,8 @@ if [ -z "${REPOSITORY}" ]; then
   fi
 fi
 
+
+
 sudo mkdir -p /etc/ansible
 echo -e "[local]\nlocalhost ansible_connection=local" | sudo tee /etc/ansible/hosts > /dev/null
 
@@ -173,7 +175,10 @@ fi
 
 sudo pip install ansible==2.8.8
 
+# Export various environment variables
 export MY_IP=$(ip -4 route get 8.8.8.8 | awk {'print $7'} | tr -d '\n')
+TOTAL_MEMORY_KB=$(grep MemTotal /proc/meminfo | awk {'print $2'})
+export VIEWER_MEMORY_LIMIT_KB=$(echo "$TOTAL_MEMORY_KB" * 0.7 | bc)
 
 sudo -u pi ansible localhost \
     -m git \
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index f2054913..ccacd643 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -12,6 +12,7 @@ services:
 
   srly-ose-viewer:
     image: screenly/srly-ose-viewer:${DOCKER_TAG}-${DEVICE_TYPE}
+    mem_limit: ${VIEWER_MEMORY_LIMIT_KB}k
     volumes:
       - /home/pi/.screenly:/data/.screenly
       - /home/pi/screenly_assets:/data/screenly_assets