diff --git a/ansible/roles/mythfrontend/defaults/main.yml b/ansible/roles/mythfrontend/defaults/main.yml
index fa00e87b..12661017 100644
--- a/ansible/roles/mythfrontend/defaults/main.yml
+++ b/ansible/roles/mythfrontend/defaults/main.yml
@@ -230,7 +230,7 @@ ir_device:
 mythdb_overrides: {}
 db: "{{ db_defaults | combine(mythdb_overrides) }}"
 
-mythtv_version: 35
+mythtv_version: 36
 
 network_defaults:
   address: "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}"
diff --git a/images/mythtv-backend/Dockerfile b/images/mythtv-backend/Dockerfile
index eb0b3824..ab1bd2ab 100644
--- a/images/mythtv-backend/Dockerfile
+++ b/images/mythtv-backend/Dockerfile
@@ -17,19 +17,16 @@ ENV APACHE_LOG_DIR=/var/log/apache2 \
     LOCALHOSTNAME= \
     TZ=UTC
 
-ARG APT_SIG=13551B881504888C
 ARG MYTHTV_GID=100
 ARG MYTHTV_UID=2021
-ARG MYTHTV_PPA=http://ppa.launchpad.net/mythbuntu/35
-ARG MYTHTV_VERSION=2:35.0+fixes.202512301852.805e05b76a~ubuntu24.04.1
+ARG MYTHTV_PPA=ppa:mythbuntu/36
+ARG MYTHTV_VERSION=2:36.0+fixes.202602100833.1385cbfc60~ubuntu24.04.1
 ARG MYTHLINK_SHA=459cb8b60adae4b631a95a9cfb1b41dcb959cc4a0b9053582a711d58b8d8a0d2
 
 RUN \
   apt-get -yq update && \
-  apt-get install -yq gnupg locales wget && \
-  apt-key adv --recv-keys --keyserver keyserver.ubuntu.com $APT_SIG && \
-  echo "deb $MYTHTV_PPA/ubuntu noble main" \
-    > /etc/apt/sources.list.d/mythbuntu.list && \
+  apt-get install -yq gnupg locales software-properties-common wget && \
+  add-apt-repository $MYTHTV_PPA && \
   apt-get -yq update && \
   locale-gen $LANG && \
   echo "# added via Dockerfile\npath-include=/usr/share/doc/mythtv-backend/contrib/*" > \
diff --git a/images/mythtv-backend/helm/Chart.yaml b/images/mythtv-backend/helm/Chart.yaml
index c46c6de6..8a436546 100644
--- a/images/mythtv-backend/helm/Chart.yaml
+++ b/images/mythtv-backend/helm/Chart.yaml
@@ -7,7 +7,7 @@ sources:
 - https://github.com/mythtv/mythtv
 type: application
 version: 0.1.18
-appVersion: "35.0-fixes.202512301852.805e05b76a"
+appVersion: "36.0-fixes.202602100833.1385cbfc60"
 dependencies:
 - name: chartlib
   version: 0.1.8
diff --git a/images/mythtv-backend/src/entrypoint.sh b/images/mythtv-backend/src/entrypoint.sh
index f6c178c3..e384ec8d 100755
--- a/images/mythtv-backend/src/entrypoint.sh
+++ b/images/mythtv-backend/src/entrypoint.sh
@@ -5,8 +5,6 @@ OSTYPE=`grep ^ID= /etc/os-release|cut -f 2 -d=`
 
 localedef -i $(cut -d. -f1 <<< $LANGUAGE) -f $(cut -d. -f2 <<< $LANGUAGE) $LANG
 
-# TODO - clean out dangling references to apache2, which is no longer used
-
 if [ "$OSTYPE" == "opensuse" ]; then
   ln -fns /usr/share/zoneinfo/$TZ /etc/localtime
   CONF_DIR=/etc/apache2/conf.d
@@ -14,11 +12,9 @@ elif [ "$OSTYPE" == "ubuntu" ]; then
   if [[ $(cat /etc/timezone) != $TZ ]]; then
     echo $TZ > /etc/timezone
     DIR=/etc/php/$(php -v|grep PHP | grep -oP "\\d+\.\\d+" | head -1)
-    echo "date.timezone = $TZ" > $DIR/apache2/conf.d/50-tz.ini
     echo "date.timezone = $TZ" > $DIR/cli/conf.d/50-tz.ini
     dpkg-reconfigure -f noninteractive tzdata
   fi
-  CONF_DIR=/etc/apache2/sites-available
 fi
 
 if [ -e /run/secrets/mythtv-db-password ]; then
diff --git a/k8s/helm/wordpress/values.yaml b/k8s/helm/wordpress/values.yaml
index 180d8044..3dcf67f4 100644
--- a/k8s/helm/wordpress/values.yaml
+++ b/k8s/helm/wordpress/values.yaml
@@ -49,6 +49,8 @@ deployment:
       secretKeyRef:
         name: wordpress
         key: WORDPRESS_NONCE_SALT
+  securityContext:
+    runAsUser: 33
 
 volumeMounts:
 - mountPath: /usr/local/etc/php/conf.d/local-php.ini