18 changed files with 278 additions and 257 deletions
--- a/00-common.yml
+++ b/00-common.yml
@ -7,9 +7,9 @@ type: Opaque
 stringData:
  JICOFO_AUTH_PASSWORD: 1b90bbfb8b17b3b8f610dd9e282b076c
  JVB_AUTH_PASSWORD: 21e5abd0efbb69e31facbf735d737caa
-  # JIGASI_XMPP_PASSWORD: 78e1d598b43d57a7ce38d5a102a48946
-  # JIBRI_RECORDER_PASSWORD: 3fc11181cc426d698317bceab3fe76ad
-  # JIBRI_XMPP_PASSWORD: 21412968cb037cd706996bcbb1c5502a
+  JIGASI_XMPP_PASSWORD: 78e1d598b43d57a7ce38d5a102a48946
+  JIBRI_RECORDER_PASSWORD: 3fc11181cc426d698317bceab3fe76ad
+  JIBRI_XMPP_PASSWORD: 21412968cb037cd706996bcbb1c5502a

 ---

@ -26,7 +26,7 @@ data:
  ETHERPAD_SKIN_VARIANTS: "super-light-toolbar super-light-editor light-background full-width-editor"
  ENABLE_AUTH: "1"
  AUTH_TYPE: internal
-  XMPP_SERVER: jitsi-prosody.external-app-development.svc.cluster.local
-  XMPP_BOSH_URL_BASE: http://jitsi-prosody.external-app-development.svc.cluster.local:5280
+  XMPP_SERVER: prosody.jitsi.svc.cluster.local
+  XMPP_BOSH_URL: http://prosody:5280
  PUBLIC_URL: jitsi.dev.srv.k8s.bevonodas.euronetrt.hu
  JVB_PORT: "10000"
--- a/01-storages.yml
+++ b/01-storages.yml
@ -1,11 +1,53 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: jitsi
+  name: jitsi-web
  namespace: external-app-development
 spec:
  accessModes:
    - ReadWriteMany
  resources:
    requests:
-      storage: 2G
+      storage: 10Mi
+
+---
+
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: jitsi-prosody
+  namespace: external-app-development
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 10Mi
+
+---
+
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: jitsi-jicofo
+  namespace: external-app-development
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 10Mi
+
+---
+
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: jitsi-jvb
+  namespace: external-app-development
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 10Mi
--- a/02-deployments.yml
+++ b/02-deployments.yml
@ -1,12 +1,12 @@
-# apiVersion: v1
-# kind: ConfigMap
-# metadata:
-#   name: jitsi-web-conf
-#   namespace: external-app-development
-# data:
-#   20-use-env: |-
-#     #!/bin/bash
-#     sed -i "s|xmpp.meet.jitsi|XMPP_SERVER|" /config/nginx/meet.conf
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: jitsi-web-conf
+  namespace: external-app-development
+data:
+  20-use-env: |-
+    #!/bin/bash
+    sed -i "s|xmpp.meet.jitsi|XMPP_SERVER|" /config/nginx/meet.conf

 ---

@ -37,38 +37,34 @@ spec:
                values:
                - arm64
                - amd64
-      # initContainers:
-      #   - name: jitsi-web-conf
-      #     image: busybox
-      #     args: ["sh", "-c", "cat /20-use-env | sed \"s/XMPP_SERVER/$XMPP_SERVER/\" > /config/20-use-env && chmod +x /config/20-use-env"]
-      #     volumeMounts:
-      #       - mountPath: /config
-      #         name: jitsi
-      #         subPath: web
-      #       - mountPath: /20-use-env
-      #         name: jitsi-web-conf
-      #         subPath: 20-use-env
-      #     envFrom:
-      #       - configMapRef:
-      #           name: jitsi-env
-      #     securityContext:
-      #       runAsUser: 1000
-      #       runAsGroup: 1000
-      #       allowPrivilegeEscalation: false
-      #       capabilities:
-      #         drop:
-      #           - ALL
-      #       runAsNonRoot: true
-      #       seccompProfile:
-      #         type: RuntimeDefault
+      initContainers:
+        - name: jitsi-web-conf
+          image: busybox
+          args: ["sh", "-c", "cat /20-use-env | sed \"s/XMPP_SERVER/$XMPP_SERVER/\" > /config/20-use-env && chmod +x /config/20-use-env"]
+          volumeMounts:
+            - mountPath: /config
+              name: jitsi-web
+            - mountPath: /20-use-env
+              name: jitsi-web-conf
+              subPath: 20-use-env
+          envFrom:
+            - configMapRef:
+                name: jitsi-env
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - ALL
+            runAsNonRoot: true
+            seccompProfile:
+              type: RuntimeDefault
      containers:
        - name: jitsi-web
-          image: dowerx/jitsi-web:non-root
-          imagePullPolicy: Always
+          image: jitsi/web:stable-9457-2
          ports:
-            - containerPort: 8000
+            - containerPort: 80
              protocol: TCP
-            - containerPort: 8443
+            - containerPort: 443
              protocol: TCP
          envFrom:
            - configMapRef:
@ -84,37 +80,34 @@ spec:
                secretKeyRef:
                  name: jitsi-passwords
                  key: JVB_AUTH_PASSWORD
-            # - name: JIGASI_XMPP_PASSWORD
-            #   valueFrom:
-            #     secretKeyRef:
-            #       name: jitsi-passwords
-            #       key: JIGASI_XMPP_PASSWORD
-            # - name: JIBRI_RECORDER_PASSWORD
-            #   valueFrom:
-            #     secretKeyRef:
-            #       name: jitsi-passwords
-            #       key: JIBRI_RECORDER_PASSWORD
-            # - name: JIBRI_XMPP_PASSWORD
-            #   valueFrom:
-            #     secretKeyRef:
-            #       name: jitsi-passwords
-            #       key: JIBRI_XMPP_PASSWORD
-          # volumeMounts:
-          #   - mountPath: /config
-          #     name: jitsi
-          #     subPath: web
-          #   - mountPath: /var/spool/cron/crontabs
-          #     name: jitsi
-          #     subPath: web/crontabs
-          #   - mountPath: /usr/share/jitsi-meet/transcripts
-          #     name: jitsi
-          #     subPath: web/transcripts
-            # - mountPath: /etc/cont-init.d/20-use-env
-            #   name: jitsi
-            #   subPath: web/20-use-env
+            - name: JIGASI_XMPP_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: jitsi-passwords
+                  key: JIGASI_XMPP_PASSWORD
+            - name: JIBRI_RECORDER_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: jitsi-passwords
+                  key: JIBRI_RECORDER_PASSWORD
+            - name: JIBRI_XMPP_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: jitsi-passwords
+                  key: JIBRI_XMPP_PASSWORD
+          volumeMounts:
+            - mountPath: /config
+              name: jitsi-web
+            - mountPath: /var/spool/cron/crontabs
+              name: jitsi-web
+              subPath: crontabs
+            - mountPath: /usr/share/jitsi-meet/transcripts
+              name: jitsi-web
+              subPath: transcripts
+            - mountPath: /etc/cont-init.d/20-use-env
+              name: jitsi-web
+              subPath: 20-use-env
          securityContext:
-            runAsUser: 1000
-            runAsGroup: 1000
            allowPrivilegeEscalation: false
            capabilities:
              drop:
@ -139,16 +132,16 @@ spec:
          #     port: 80
          #   initialDelaySeconds: 15
          #   periodSeconds: 10
-      # volumes:
-      #   - name: jitsi
-      #     persistentVolumeClaim:
-      #       claimName: jitsi
-      #   - name: jitsi-web-conf
-      #     configMap:
-      #       name: jitsi-web-conf
-      #       items:
-      #         - key: 20-use-env
-      #           path: 20-use-env
+      volumes:
+        - name: jitsi-web
+          persistentVolumeClaim:
+            claimName: jitsi-web
+        - name: jitsi-web-conf
+          configMap:
+            name: jitsi-web-conf
+            items:
+              - key: 20-use-env
+                path: 20-use-env
 ---
 kind: Deployment
 apiVersion: apps/v1
@ -179,7 +172,7 @@ spec:
                - amd64
      containers:
        - name: jitsi-prosody
-          image: dowerx/prosody:non-root
+          image: jitsi/prosody:stable-9457-2
          ports:
            - containerPort: 5222
              protocol: TCP
@ -203,24 +196,22 @@ spec:
                secretKeyRef:
                  name: jitsi-passwords
                  key: JVB_AUTH_PASSWORD
-            # - name: JIGASI_XMPP_PASSWORD
-            #   valueFrom:
-            #     secretKeyRef:
-            #       name: jitsi-passwords
-            #       key: JIGASI_XMPP_PASSWORD
-            # - name: JIBRI_RECORDER_PASSWORD
-            #   valueFrom:
-            #     secretKeyRef:
-            #       name: jitsi-passwords
-            #       key: JIBRI_RECORDER_PASSWORD
-            # - name: JIBRI_XMPP_PASSWORD
-            #   valueFrom:
-            #     secretKeyRef:
-            #       name: jitsi-passwords
-            #       key: JIBRI_XMPP_PASSWORD
+            - name: JIGASI_XMPP_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: jitsi-passwords
+                  key: JIGASI_XMPP_PASSWORD
+            - name: JIBRI_RECORDER_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: jitsi-passwords
+                  key: JIBRI_RECORDER_PASSWORD
+            - name: JIBRI_XMPP_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: jitsi-passwords
+                  key: JIBRI_XMPP_PASSWORD
          securityContext:
-            runAsUser: 1000
-            runAsGroup: 1000
            allowPrivilegeEscalation: false
            capabilities:
              drop:
@ -230,11 +221,10 @@ spec:
              type: RuntimeDefault
          volumeMounts:
            - mountPath: /config
-              name: jitsi
-              subPath: prosody
+              name: jitsi-prosody
            - mountPath: /prosody-plugins-custom
-              name: jitsi
-              subPath: prosody/prosody-plugins-custom
+              name: jitsi-prosody
+              subPath: prosody-plugins-custom
          resources:
            limits:
              cpu: "500m"
@ -252,12 +242,10 @@ spec:
          #     port: 5280
          #   initialDelaySeconds: 15
          #   periodSeconds: 10
-      securityContext:
-        fsGroup: 1000
      volumes:
-        - name: jitsi
+        - name: jitsi-prosody
          persistentVolumeClaim:
-            claimName: jitsi
+            claimName: jitsi-prosody
 ---
 kind: Deployment
 apiVersion: apps/v1
@ -288,7 +276,7 @@ spec:
                - amd64
      containers:
        - name: jitsi-jicofo
-          image: dowerx/jicofo:non-root
+          image: jitsi/jicofo:stable-9457-2
          ports:
            - containerPort: 8888
              protocol: TCP
@ -306,24 +294,22 @@ spec:
                secretKeyRef:
                  name: jitsi-passwords
                  key: JVB_AUTH_PASSWORD
-            # - name: JIGASI_XMPP_PASSWORD
-            #   valueFrom:
-            #     secretKeyRef:
-            #       name: jitsi-passwords
-            #       key: JIGASI_XMPP_PASSWORD
-            # - name: JIBRI_RECORDER_PASSWORD
-            #   valueFrom:
-            #     secretKeyRef:
-            #       name: jitsi-passwords
-            #       key: JIBRI_RECORDER_PASSWORD
-            # - name: JIBRI_XMPP_PASSWORD
-            #   valueFrom:
-            #     secretKeyRef:
-            #       name: jitsi-passwords
-            #       key: JIBRI_XMPP_PASSWORD
+            - name: JIGASI_XMPP_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: jitsi-passwords
+                  key: JIGASI_XMPP_PASSWORD
+            - name: JIBRI_RECORDER_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: jitsi-passwords
+                  key: JIBRI_RECORDER_PASSWORD
+            - name: JIBRI_XMPP_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: jitsi-passwords
+                  key: JIBRI_XMPP_PASSWORD
          securityContext:
-            runAsUser: 1000
-            runAsGroup: 1000
            allowPrivilegeEscalation: false
            capabilities:
              drop:
@ -331,10 +317,9 @@ spec:
            runAsNonRoot: true
            seccompProfile:
              type: RuntimeDefault
-          # volumeMounts:
-          #   - mountPath: /config
-          #     name: jitsi
-          #     subPath: jicofo
+          volumeMounts:
+            - mountPath: /config
+              name: jitsi-jicofo
          resources:
            limits:
              cpu: "500m"
@ -352,10 +337,10 @@ spec:
          #     port: 8888
          #   initialDelaySeconds: 15
          #   periodSeconds: 10
-      # volumes:
-      #   - name: jitsi
-      #     persistentVolumeClaim:
-      #       claimName: jitsi
+      volumes:
+        - name: jitsi-jicofo
+          persistentVolumeClaim:
+            claimName: jitsi-jicofo
 ---
 kind: Deployment
 apiVersion: apps/v1
@ -386,7 +371,7 @@ spec:
                - amd64
      containers:
        - name: jitsi-jvb
-          image: dowerx/jvb:non-root
+          image: jitsi/jvb:stable-9457-2
          ports:
            - containerPort: 10000
              protocol: UDP
@ -406,24 +391,22 @@ spec:
                secretKeyRef:
                  name: jitsi-passwords
                  key: JVB_AUTH_PASSWORD
-            # - name: JIGASI_XMPP_PASSWORD
-            #   valueFrom:
-            #     secretKeyRef:
-            #       name: jitsi-passwords
-            #       key: JIGASI_XMPP_PASSWORD
-            # - name: JIBRI_RECORDER_PASSWORD
-            #   valueFrom:
-            #     secretKeyRef:
-            #       name: jitsi-passwords
-            #       key: JIBRI_RECORDER_PASSWORD
-            # - name: JIBRI_XMPP_PASSWORD
-            #   valueFrom:
-            #     secretKeyRef:
-            #       name: jitsi-passwords
-            #       key: JIBRI_XMPP_PASSWORD
+            - name: JIGASI_XMPP_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: jitsi-passwords
+                  key: JIGASI_XMPP_PASSWORD
+            - name: JIBRI_RECORDER_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: jitsi-passwords
+                  key: JIBRI_RECORDER_PASSWORD
+            - name: JIBRI_XMPP_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: jitsi-passwords
+                  key: JIBRI_XMPP_PASSWORD
          securityContext:
-            runAsUser: 1000
-            runAsGroup: 1000
            allowPrivilegeEscalation: false
            capabilities:
              drop:
@ -431,10 +414,9 @@ spec:
            runAsNonRoot: true
            seccompProfile:
              type: RuntimeDefault
-          # volumeMounts:
-          #   - mountPath: /config
-          #     subPath: jvb
-          #     name: jitsi
+          volumeMounts:
+            - mountPath: /config
+              name: jitsi-jvb
          resources:
            limits:
              cpu: "500m"
@ -452,7 +434,7 @@ spec:
          #     port: 8080
          #   initialDelaySeconds: 15
          #   periodSeconds: 10
-      # volumes:
-      #   - name: jitsi
-      #     persistentVolumeClaim:
-      #       claimName: jitsi
+      volumes:
+        - name: jitsi-jvb
+          persistentVolumeClaim:
+            claimName: jitsi-jvb
--- a/03-services.yml
+++ b/03-services.yml
@ -5,12 +5,12 @@ metadata:
  namespace: external-app-development
 spec:
  ports:
-    - port: 8000
-      targetPort: 8000
+    - port: 80
+      targetPort: 80
      name: http
      protocol: TCP   
-    - port: 8443
-      targetPort: 8443
+    - port: 443
+      targetPort: 443
      name: https
      protocol: TCP   
  selector:
@ -60,7 +60,7 @@ spec:
  selector:
    app: jitsi-jvb

-# ---
+---

 # apiVersion: traefik.io/v1alpha1
 # kind: IngressRouteUDP
@ -146,4 +146,4 @@ spec:
            service:
              name: jitsi-web
              port:
-                number: 8000
+                number: 80
--- a/04-add-users.yml
+++ b/04-add-users.yml
@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: jitsi-users
+  name: users
 data:
  users: |-
    user1 asdqwe
@ -50,71 +50,61 @@ spec:
                - amd64
      containers:
      - name: add-users
-        image: dowerx/prosody:non-root
+        image: jitsi/prosody:stable-9457-2
        command: ["/bin/bash", "-c"]
        args: ["bash /clear.sh && bash /add.sh"]
        envFrom:
          - configMapRef:
-              name: jitsi-env
+              name: env
        env:
          - name: JICOFO_AUTH_PASSWORD
            valueFrom:
              secretKeyRef:
-                name: jitsi-passwords
+                name: passwords
                key: JICOFO_AUTH_PASSWORD
          - name: JVB_AUTH_PASSWORD
            valueFrom:
              secretKeyRef:
-                name: jitsi-passwords
+                name: passwords
                key: JVB_AUTH_PASSWORD
          - name: JIGASI_XMPP_PASSWORD
            valueFrom:
              secretKeyRef:
-                name: jitsi-passwords
+                name: passwords
                key: JIGASI_XMPP_PASSWORD
          - name: JIBRI_RECORDER_PASSWORD
            valueFrom:
              secretKeyRef:
-                name: jitsi-passwords
+                name: passwords
                key: JIBRI_RECORDER_PASSWORD
          - name: JIBRI_XMPP_PASSWORD
            valueFrom:
              secretKeyRef:
-                name: jitsi-passwords
+                name: passwords
                key: JIBRI_XMPP_PASSWORD
-        securityContext:
-            runAsUser: 1000
-            runAsGroup: 1000
-            allowPrivilegeEscalation: false
-            capabilities:
-              drop:
-                - ALL
-            runAsNonRoot: true
-            seccompProfile:
-              type: RuntimeDefault
        volumeMounts:
          - mountPath: /config
-            name: jitsi
-            subPath: prosody
+            name: prosody
+          - mountPath: /prosody-plugins-custom
+            name: prosody
+            subPath: prosody-plugins-custom
          - mountPath: /users
-            name: jitsi-users
+            name: users
            subPath: users
          - mountPath: /clear.sh
-            name: jitsi-users
+            name: users
            subPath: clear.sh
          - mountPath: /add.sh
-            name: jitsi-users
+            name: users
            subPath: add.sh
      restartPolicy: OnFailure
-      securityContext:
-        fsGroup: 1000
      volumes:
-        - name: jitsi
+        - name: prosody
          persistentVolumeClaim:
-            claimName: jitsi
-        - name: jitsi-users
+            claimName: prosody
+        - name: users
          configMap:
-            name: jitsi-users
+            name: users
            items:
              - key: users
                path: users
--- a/containers/docker-compose.yml
+++ b/containers/docker-compose.yml
@ -1,7 +1,7 @@
 services:
    # Frontend
    web:
-        image: dowerx/jitsi-web:non-root
+        image: jitsi/web:non-root
        restart: ${RESTART_POLICY:-unless-stopped}
        ports:
            - '${HTTP_PORT}:80'
@ -174,7 +174,7 @@ services:

    # XMPP server
    prosody:
-        image: dowerx/prosody:non-root
+        image: jitsi/prosody:non-root
        restart: ${RESTART_POLICY:-unless-stopped}
        expose:
            - '${XMPP_PORT:-5222}'
@ -306,7 +306,7 @@ services:

    # Focus component
    jicofo:
-        image: dowerx/jicofo:non-root
+        image: jitsi/jicofo:non-root
        restart: ${RESTART_POLICY:-unless-stopped}
        ports:
            - '127.0.0.1:${JICOFO_REST_PORT:-8888}:8888'
@ -388,7 +388,7 @@ services:
    # Video bridge

    jvb:
-        image: dowerx/jvb:non-root
+        image: jitsi/jvb:non-root
        restart: ${RESTART_POLICY:-unless-stopped}
        ports:
            - '${JVB_PORT:-10000}:${JVB_PORT:-10000}/udp'
--- a/containers/non-root/base-java.build.yml
+++ b/containers/non-root/base-java.build.yml
@ -1,18 +1,15 @@
 registry: docker.io
 repos:
-  - name: jitsi-base-java
-    library: dowerx
+  - name: base-java
+    library: jitsi
    repo: base-java
-    action: push
+    action: load
    tags:
-      - name: latest
-        builds:
-          - non-root-amd64
-          - non-root-arm64
      - name: non-root
        builds:
          - non-root-amd64
          - non-root-arm64
+          - non-root-armv7
    builds:
      - arch: amd64
        dockerfile: Dockerfile
@ -22,3 +19,7 @@ repos:
        dockerfile: Dockerfile
        tags:
          - non-root-arm64
+      - arch: armv7
+        dockerfile: Dockerfile
+        tags:
+          - non-root-armv7
--- a/containers/non-root/base-java/Dockerfile
+++ b/containers/non-root/base-java/Dockerfile
@ -1,4 +1,5 @@
-FROM dowerx/jitsi-base:non-root
+# jitsi/base-java:non-root
+FROM jitsi/base:non-root

 RUN mkdir -p /usr/share/man/man1 && \
    mkdir -p /etc/apt/keyrings/ && \
--- a/containers/non-root/base.build.yml
+++ b/containers/non-root/base.build.yml
@ -1,18 +1,15 @@
 registry: docker.io
 repos:
-  - name: jitsi-base
-    library: dowerx
+  - name: base
+    library: jitsi
    repo: base
-    action: push
+    action: load
    tags:
-      - name: latest
-        builds:
-          - non-root-amd64
-          - non-root-arm64
      - name: non-root
        builds:
          - non-root-amd64
          - non-root-arm64
+          - non-root-armv7
    builds:
      - arch: amd64
        dockerfile: Dockerfile
@ -22,6 +19,7 @@ repos:
        dockerfile: Dockerfile
        tags:
          - non-root-arm64
-        env:
-          - key: ARCH
-            value: arm64
+      - arch: armv7
+        dockerfile: Dockerfile
+        tags:
+          - non-root-armv7
--- a/containers/non-root/jicofo.build.yml
+++ b/containers/non-root/jicofo.build.yml
@ -1,18 +1,15 @@
 registry: docker.io
 repos:
  - name: jicofo
-    library: dowerx
+    library: jitsi
    repo: jicofo
-    action: push
+    action: load
    tags:
-      - name: latest
-        builds:
-          - non-root-amd64
-          - non-root-arm64
      - name: non-root
        builds:
          - non-root-amd64
          - non-root-arm64
+          - non-root-armv7
    builds:
      - arch: amd64
        dockerfile: Dockerfile
@ -22,3 +19,7 @@ repos:
        dockerfile: Dockerfile
        tags:
          - non-root-arm64
+      - arch: armv7
+        dockerfile: Dockerfile
+        tags:
+          - non-root-armv7
--- a/containers/non-root/jicofo/Dockerfile
+++ b/containers/non-root/jicofo/Dockerfile
@ -1,4 +1,5 @@
-FROM dowerx/jitsi-base-java:non-root
+# jitsi/jicofo:non-root
+FROM jitsi/base-java:non-root

 RUN apt-get update && \
    apt-get install -y jicofo && \
--- a/containers/non-root/jvb.build.yml
+++ b/containers/non-root/jvb.build.yml
@ -1,18 +1,15 @@
 registry: docker.io
 repos:
  - name: jvb
-    library: dowerx
+    library: jitsi
    repo: jvb
-    action: push
+    action: load
    tags:
-      - name: latest
-        builds:
-          - non-root-amd64
-          - non-root-arm64
      - name: non-root
        builds:
          - non-root-amd64
          - non-root-arm64
+          - non-root-armv7
    builds:
      - arch: amd64
        dockerfile: Dockerfile
@ -22,3 +19,7 @@ repos:
        dockerfile: Dockerfile
        tags:
          - non-root-arm64
+      - arch: armv7
+        dockerfile: Dockerfile
+        tags:
+          - non-root-armv7
--- a/containers/non-root/jvb/Dockerfile
+++ b/containers/non-root/jvb/Dockerfile
@ -1,4 +1,5 @@
-FROM dowerx/jitsi-base-java:non-root
+# jitsi/jvb:non-root
+FROM jitsi/base-java:non-root

 RUN apt-get update && \
    apt-get install -y jitsi-videobridge2 jitsi-autoscaler-sidecar jq curl iproute2 dnsutils libpcap0.8 && \
--- a/containers/non-root/prosody.build.yml
+++ b/containers/non-root/prosody.build.yml
@ -1,18 +1,15 @@
 registry: docker.io
 repos:
  - name: prosody
-    library: dowerx
+    library: jitsi
    repo: prosody
-    action: push
+    action: load
    tags:
-      - name: latest
-        builds:
-          - non-root-amd64
-          - non-root-arm64
      - name: non-root
        builds:
          - non-root-amd64
          - non-root-arm64
+          - non-root-armv7
    builds:
      - arch: amd64
        dockerfile: Dockerfile
@ -22,3 +19,7 @@ repos:
        dockerfile: Dockerfile
        tags:
          - non-root-arm64
+      - arch: armv7
+        dockerfile: Dockerfile
+        tags:
+          - non-root-armv7
--- a/containers/non-root/prosody/Dockerfile
+++ b/containers/non-root/prosody/Dockerfile
@ -1,7 +1,7 @@
 ARG JITSI_REPO=jitsi
 ARG BASE_TAG=latest

-FROM dowerx/jitsi-base:non-root AS builder
+FROM jitsi/base:non-root AS builder

 RUN apt-get update && \
    apt-get install -y \
@ -19,7 +19,7 @@ RUN apt-get update && \
    luarocks install lua-cjson 2.1.0-1 && \
    luarocks install net-url 0.9-1

-FROM dowerx/jitsi-base:non-root
+FROM jitsi/base:non-root

 ARG VERSION_JITSI_CONTRIB_PROSODY_PLUGINS="20240117"
 ARG VERSION_MATRIX_USER_VERIFICATION_SERVICE_PLUGIN="1.8.0"
--- a/containers/non-root/web.build.yml
+++ b/containers/non-root/web.build.yml
@ -1,18 +1,15 @@
 registry: docker.io
 repos:
-  - name: jitsi-web
-    library: dowerx
+  - name: web
+    library: jitsi
    repo: web
-    action: push
+    action: load
    tags:
-      - name: latest
-        builds:
-          - non-root-amd64
-          - non-root-arm64
      - name: non-root
        builds:
          - non-root-amd64
          - non-root-arm64
+          - non-root-armv7
    builds:
      - arch: amd64
        dockerfile: Dockerfile
@ -22,3 +19,7 @@ repos:
        dockerfile: Dockerfile
        tags:
          - non-root-arm64
+      - arch: armv7
+        dockerfile: Dockerfile
+        tags:
+          - non-root-armv7
--- a/containers/non-root/web/Dockerfile
+++ b/containers/non-root/web/Dockerfile
@ -1,4 +1,5 @@
-FROM dowerx/jitsi-base:non-root
+# jitsi/web:non-root
+FROM jitsi/base:non-root

 RUN \
  apt-get update && apt-get install -y --no-install-recommends \
--- a/containers/non-root/web/defaults/default
+++ b/containers/non-root/web/defaults/default
@ -1,8 +1,8 @@
 server {
-	listen 8000 default_server;
+	listen 80 default_server;
 	
 	{{ if .Env.ENABLE_IPV6 | default "1" | toBool }}
-	listen [::]:8000 default_server;
+	listen [::]:80 default_server;
 	{{ end }}

 	{{ if .Env.ENABLE_HTTP_REDIRECT | default "0" | toBool }}
@ -14,10 +14,10 @@ server {

 {{ if not (.Env.DISABLE_HTTPS | default "0" | toBool) }}
 server {
-	listen 8443 ssl http2;
+	listen 443 ssl http2;
 	
 	{{ if .Env.ENABLE_IPV6 | default "1" | toBool }}
-	listen [::]:8443 ssl http2;
+	listen [::]:443 ssl http2;
 	{{ end }}

 	include /config/nginx/ssl.conf;