diff --git a/CT-Build/Alpine.yaml b/CT-Build/Alpine.yaml
index deaf88f..e628dbf 100644
--- a/CT-Build/Alpine.yaml
+++ b/CT-Build/Alpine.yaml
@@ -1,6 +1,6 @@
 image:
   distribution: "alpinelinux"
-  release: "3.15"
+  release: "3.16"
 
 source:
   downloader: alpinelinux-http
@@ -540,23 +540,23 @@ packages:
 #PKGS for Elkarbackup
   - packages:
     - rsnapshot
-    - php7
-    - php7-openssl
-    - php7-phar
-    - php7-mbstring
-    - php7-iconv
-    - php7-json
-    - php7-ctype
-    - php7-xml
-    - php7-tokenizer
-    - php7-dom
-    - php7-session
-    - php7-simplexml
-    - php7-posix
-    - php7-fpm
-    - php7-pdo_mysql
-    - php7-pcntl
-    - php7-fileinfo
+    - php7@CommunityOldStable
+    - php7-openssl@CommunityOldStable
+    - php7-phar@CommunityOldStable
+    - php7-mbstring@CommunityOldStable
+    - php7-iconv@CommunityOldStable
+    - php7-json@CommunityOldStable
+    - php7-ctype@CommunityOldStable
+    - php7-xml@CommunityOldStable
+    - php7-tokenizer@CommunityOldStable
+    - php7-dom@CommunityOldStable
+    - php7-session@CommunityOldStable
+    - php7-simplexml@CommunityOldStable
+    - php7-posix@CommunityOldStable
+    - php7-fpm@CommunityOldStable
+    - php7-pdo_mysql@CommunityOldStable
+    - php7-pcntl@CommunityOldStable
+    - php7-fileinfo@CommunityOldStable
     - coreutils
     - sudo
     action: install
@@ -566,6 +566,19 @@ packages:
 #PKGS for Heimdall
   - packages:
     - git
+    - php8
+    - php8-ctype
+    - php8-curl
+    - php8-pdo_sqlite
+    - php8-mbstring
+    - php8-json
+    - php8-zip
+    - php8-xml
+    - php8-fpm
+    - php8-session
+    - php8-openssl
+    - php8-tokenizer
+
     action: install
     variants:
     - heimdall 
@@ -586,7 +599,7 @@ packages:
       #EndREPOS
       {% if image.variant == "ddns" %}@TestingEdge http://dl-4.alpinelinux.org/alpine/edge/testing{% endif %}
       {% if image.variant == "vouchproxy" %}@CommunityEdge http://dl-4.alpinelinux.org/alpine/edge/community{% endif %}
-
+      {% if image.variant == "elkarbackupALP" %}@CommunityOldStable http://dl-4.alpinelinux.org/alpine/v3.15/community{% endif %}
 
 actions:
 - trigger: post-unpack
diff --git a/CT-Files/elkarbackupALP/Scripts/Init.sh b/CT-Files/elkarbackupALP/Scripts/Init.sh
index a8eed83..5c6adc0 100644
--- a/CT-Files/elkarbackupALP/Scripts/Init.sh
+++ b/CT-Files/elkarbackupALP/Scripts/Init.sh
@@ -31,7 +31,7 @@ rm -rf /etc/nginx/conf.d
 mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf
 
 #Configure Php
-rm -rf /etc/php8/php-fpm.d/*
+rm -rf /etc/php7/php-fpm.d/*
 mv /opt/Setup/Configs/php.conf /etc/php7/php-fpm.d/elkarbackup.conf
 mv /opt/Setup/Configs/phpTimezone.ini /etc/php7/conf.d/04_date_timezone.ini
 
diff --git a/CT-Files/heimdall/Configs/nginx.conf b/CT-Files/heimdall/Configs/nginx.conf
index 2f43ba8..4984116 100644
--- a/CT-Files/heimdall/Configs/nginx.conf
+++ b/CT-Files/heimdall/Configs/nginx.conf
@@ -37,7 +37,7 @@ http {
         }
         location ~ \.php$ {
             include fastcgi_params;
-            fastcgi_pass unix:/run/php-fpm7/php-fpm.sock;
+            fastcgi_pass unix:/run/php-fpm8/php-fpm.sock;
             fastcgi_split_path_info         ^(.+\.php)(/.+)$;
             fastcgi_index                   index.php;
             fastcgi_param                   SCRIPT_FILENAME   $document_root$fastcgi_script_name;
diff --git a/CT-Files/heimdall/Configs/php.conf b/CT-Files/heimdall/Configs/php.conf
index ff290f9..cfe3cec 100644
--- a/CT-Files/heimdall/Configs/php.conf
+++ b/CT-Files/heimdall/Configs/php.conf
@@ -1,7 +1,7 @@
 [heimdall]
 user = nginx
 group = nginx
-listen = /run/php-fpm7/php-fpm.sock
+listen = /run/php-fpm8/php-fpm.sock
 listen.owner = nginx
 listen.group = nginx
 php_admin_value[disable_functions] = exec,passthru,system
@@ -27,7 +27,7 @@ php_admin_value[max_input_time] = 15
 php_admin_value[cgi.fix_pathinfo] = 0
 php_admin_value[allow_url_fopen] = Off
 php_admin_value[file_uploads] = On
-php_admin_value[open_basedir] = /opt/heimdall:/run/php-fpm7/php-fpm.sock:/tmp
+php_admin_value[open_basedir] = /opt/heimdall:/run/php-fpm8/php-fpm.sock:/tmp
 php_admin_value[session.use_strict_mode] = 1
 php_admin_value[session.cookie_httponly] = 1
 
diff --git a/CT-Files/heimdall/Scripts/Init.sh b/CT-Files/heimdall/Scripts/Init.sh
index 4c48828..9ab0198 100644
--- a/CT-Files/heimdall/Scripts/Init.sh
+++ b/CT-Files/heimdall/Scripts/Init.sh
@@ -1,22 +1,18 @@
 #!/bin/ash
-#Install php 7.3
-echo "@phphernandev https://php.hernandev.com/v3.11/php-7.3" >> /etc/apk/repositories
-curl -L  https://php.hernandev.com/key/php-alpine.rsa.pub -o /etc/apk/keys/php-alpine.rsa.pub
-apk add php7@phphernandev php7-ctype@phphernandev php7-curl@phphernandev php7-pdo_sqlite@phphernandev php7-mbstring@phphernandev php7-json@phphernandev php7-zip@phphernandev php7-xml@phphernandev php7-fpm@phphernandev php7-session@phphernandev php7-openssl@phphernandev
 
 #Configure Nginx
 rm -rf /etc/nginx/conf.d
 mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf
 
 #Configure Php-Fpm
-rm -rf /etc/php7/php-fpm.d/*
-mv /opt/Setup/Configs/php.conf /etc/php7/php-fpm.d/heimdall.conf
-mv /opt/Setup/Configs/phpTimezone.ini /etc/php7/conf.d/04_date_timezone.ini
+rm -rf /etc/php8/php-fpm.d/*
+mv /opt/Setup/Configs/php.conf /etc/php8/php-fpm.d/heimdall.conf
+mv /opt/Setup/Configs/phpTimezone.ini /etc/php8/conf.d/04_date_timezone.ini
 
 #Install Heimdall
-git clone https://github.com/linuxserver/Heimdall.git /opt/heimdall
+git clone -b 2.x https://github.com/linuxserver/Heimdall.git /opt/heimdall
 chown -R nginx:nginx /opt/heimdall
 
 #Enable services on boot
 rc-update add nginx
-rc-update add php-fpm7
\ No newline at end of file
+rc-update add php-fpm8
\ No newline at end of file
diff --git a/Scripts/FirstSetup.sh b/Scripts/FirstSetup.sh
index 05c690a..6ff9734 100644
--- a/Scripts/FirstSetup.sh
+++ b/Scripts/FirstSetup.sh
@@ -7,8 +7,14 @@ cd "$( cd "$( dirname "$0" )" &> /dev/null && pwd )/.."
 echo "The script will now install required dependencies"
 read -r -s -p $'Press enter to continue, or ctrl+c to quit'
 #Install software dependencies
-apt install ca-certificates golang git make debootstrap curl gcc libc-dev nano gnupg2 rsync xz-utils --no-install-recommends -y
+apt install ca-certificates git make debootstrap curl gcc libc-dev nano gnupg2 rsync xz-utils --no-install-recommends -y
 
+#Install go
+rm -rf /usr/local/go
+curl -L https://go.dev/dl/go$(curl -Ls https://go.dev/VERSION?m=text |sed 's/go//g').linux-amd64.tar.gz -o /tmp/go.tar.gz
+tar -C /usr/local -xzf /tmp/go.tar.gz
+echo "export PATH=$PATH:/usr/local/go/bin" >> $HOME/.profile
+export PATH=$PATH:/usr/local/go/bin
 
 #Get Source for DistroBuilder
 git clone https://github.com/lxc/distrobuilder distrobuilderSRC