diff --git a/base.yml b/base.yml
index a18a940..b44b746 100644
--- a/base.yml
+++ b/base.yml
@@ -51,7 +51,7 @@ services:
     #  context: .
     #  dockerfile: ./compose/production/traefik/Dockerfile
     #image: mistborn_production_traefik
-    image: traefik:v2.2
+    image: traefik:v2.4.9
     container_name: mistborn_production_traefik
     depends_on:
       - django
@@ -119,7 +119,7 @@ services:
     restart: unless-stopped
   
   redis:
-    image: redis:5.0
+    image: redis:6.2-alpine
     container_name: mistborn_production_redis
     restart: unless-stopped
 
@@ -196,7 +196,7 @@ services:
   
   pihole:
    container_name: mistborn_production_pihole
-   image: pihole/pihole:v5.7
+   image: pihole/pihole:v5.8
    env_file:
      - ./.envs/.production/.pihole
    ports:
@@ -214,12 +214,12 @@ services:
       - "traefik.http.middlewares.add-pihole-admin.addPrefix.prefix=/admin"
       - "traefik.http.services.pihole-service.loadbalancer.server.port=80"
    environment:
-     - ServerIP='10.2.0.3'
-     - PIHOLE_DNS_='10.2.0.2#5054;fdce:7a9e:13ce:d817::2#5054'
-     - ServerIPv6='fdce:7a9e:13ce:d817::3'
+     - ServerIP=10.2.0.3
+     - PIHOLE_DNS_=10.2.0.2#5054;fdce:7a9e:13ce:d817::2#5054
+     - ServerIPv6=fdce:7a9e:13ce:d817::3
      #- DNS1='10.2.0.2#5054' # docs say port 5054, was 54; use network_mode: host to see which port is used
      #- DNS2=''
-     - IPv6='true'
+     - IPv6=true
      - DNSMASQ_LISTENING=all
    #  TZ: 'America/New York'
    # Volumes store your data between container upgrades
diff --git a/compose/production/postgres/Dockerfile b/compose/production/postgres/Dockerfile
index 7cf4173..c37f89c 100644
--- a/compose/production/postgres/Dockerfile
+++ b/compose/production/postgres/Dockerfile
@@ -1,4 +1,4 @@
-FROM postgres:11.3
+FROM postgres:13.3-alpine
 
 COPY ./compose/production/postgres/maintenance /usr/local/bin/maintenance
 RUN chmod +x /usr/local/bin/maintenance/*
diff --git a/compose/production/tor/Dockerfile b/compose/production/tor/Dockerfile
index 11f8bb8..d7821c9 100644
--- a/compose/production/tor/Dockerfile
+++ b/compose/production/tor/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:latest
+FROM alpine:3.14.0
 
 RUN apk update \
  && apk upgrade \
diff --git a/compose/production/traefik/Dockerfile b/compose/production/traefik/Dockerfile
index 04c5f93..8fad7ed 100644
--- a/compose/production/traefik/Dockerfile
+++ b/compose/production/traefik/Dockerfile
@@ -1,4 +1,4 @@
-FROM traefik:v2.2
+FROM traefik:v2.4.9
 RUN mkdir -p /etc/traefik/acme
 RUN touch /etc/traefik/acme/acme.json
 RUN chmod 600 /etc/traefik/acme/acme.json
diff --git a/extra/bitwarden.yml b/extra/bitwarden.yml
index cd66424..5bfa126 100644
--- a/extra/bitwarden.yml
+++ b/extra/bitwarden.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:  
   bitwarden:
-    image: bitwardenrs/server:latest
+    image: vaultwarden/server:latest
     container_name: mistborn_production_bitwarden
     env_file:
       - ../.envs/.production/.bitwarden
diff --git a/extra/elasticsearch.yml b/extra/elasticsearch.yml
index c1a3a70..ffac4d9 100644
--- a/extra/elasticsearch.yml
+++ b/extra/elasticsearch.yml
@@ -3,7 +3,7 @@ version: '3.7'
 services:
 
   elasticsearch:
-    image: amazon/opendistro-for-elasticsearch:1.12.0
+    image: amazon/opendistro-for-elasticsearch:1.13.2
     hostname: elasticsearch
     restart: unless-stopped
     ports:
diff --git a/extra/guacamole.yml b/extra/guacamole.yml
index 59a83ac..e27bca9 100644
--- a/extra/guacamole.yml
+++ b/extra/guacamole.yml
@@ -5,7 +5,7 @@ services:
   # guacd
   guacd:
     container_name: mistborn_production_guacd
-    image: guacamole/guacd
+    image: guacamole/guacd:1.3.0
     networks:
       guacnetwork:
     restart: unless-stopped
@@ -53,7 +53,7 @@ services:
       #GUACAMOLE_HOME: /config
     env_file:
     - ../.envs/.production/.guacamole
-    image: guacamole/guacamole
+    image: guacamole/guacamole:1.3.0
     links:
     - guacd
     networks:
diff --git a/extra/syncthing.yml b/extra/syncthing.yml
index f66bd73..a4ffe71 100644
--- a/extra/syncthing.yml
+++ b/extra/syncthing.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   syncthing:
-    image: linuxserver/syncthing
+    image: linuxserver/syncthing:latest
     container_name: mistborn_production_syncthing
     environment:
       - PUID=1000
diff --git a/extra/wazuh.yml b/extra/wazuh.yml
index f7df12a..46f5d27 100644
--- a/extra/wazuh.yml
+++ b/extra/wazuh.yml
@@ -3,7 +3,7 @@ version: '3.7'
 
 services:
   wazuh:
-    image: wazuh/wazuh-odfe:4.1.2
+    image: wazuh/wazuh-odfe:4.1.5
     hostname: wazuh-manager
     restart: unless-stopped
     ports:
@@ -29,7 +29,7 @@ services:
       - filebeat_var:/var/lib/filebeat
 
   wazuh-kibana:
-    image: wazuh/wazuh-kibana-odfe:4.1.2
+    image: wazuh/wazuh-kibana-odfe:4.1.5
     hostname: wazuh-kibana
     restart: unless-stopped
     labels: