diff --git a/.gitignore b/.gitignore
index a5f75a2..68efdfc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,5 @@ target/
 *.sublime-project
 *.sublime-workspace
 .vscode/
+*.yaml
+*.yml
diff --git a/Jenkinsfile b/Jenkinsfile
index 52e1d6b..a083be6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,76 +1,29 @@
 pipeline {
     agent none
     environment {
-        SNAPCRAFT_STORE_CREDENTIALS = credentials('snapcraft-store-credentials')
-    }
-    options {
-        skipDefaultCheckout(true)
+        CHAT = "devel@conference.mcmillian.dev"
     }
     stages {
         stage('Build docker image') {
             agent { label 'docker-build' }
+            environment {
+                TAG = "${env.BRANCH_NAME == "main" ? "latest" : env.BRANCH_NAME}"
+            }
             steps {
-                // mattermostSend "Docker build started - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)"
-                cleanWs()
-                checkout scm
+                jabberNotify buildToChatNotifier: [$class: 'ExtraMessageOnlyBuildToChatNotifier'], extraMessage: 'Build Started', notifySuspects: true, targets: "${CHAT}"
                 script {
-                    docker.withRegistry('https://git.dreamfall.space/thrrgilag', 'docker-gitea-creds') {
-                        def customImage = docker.build('git.dreamfall.space/thrrgilag/partybot:latest')
+                    docker.withRegistry('https://git.dreamfall.space/thrrgilag', 'thrrgilag-forgejo-pkg') {
+                        def customImage = docker.build("git.dreamfall.space/thrrgilag/partybot:${TAG}")
                         customImage.push()
                     }
                 }
             }
-            // post {
-            //     success {
-            //         mattermostSend color: "good", message: "Docker build success - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)"
-            //     }
-            //     failure {
-            //         mattermostSend color: "danger", message: "Docker build failure - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)"
-            //     }
-            // }
-        }
-        stage('Build snap packages') {
-            when { expression { false == true } }
-            parallel {
-                stage('Build snap for ARM64') {
-                    agent { label "snap-arm64" }
-                    steps {
-                        // mattermostSend "ARM64 Snap build started - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)"
-                        cleanWs()
-                        checkout scm
-                        sh "snapcraft clean"
-                        sh "snapcraft"
-                    }
-                    post {
-                        success {
-                            // mattermostSend color: "good", message: "ARM64 Snap build success - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)"
-                            archiveArtifacts artifacts: '*.snap'
-                            sh "snapcraft upload --release=edge *.snap"
-                        }
-                        // failure {
-                        //     mattermostSend color: "danger", message: "ARM64 Snap build failure - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)"
-                        // }
-                    }
+            post {
+                success {
+                    jabberNotify buildToChatNotifier: [$class: 'ExtraMessageOnlyBuildToChatNotifier'], extraMessage: 'Build Succeeded', notifySuspects: true, targets: "${CHAT}"
                 }
-                stage('Build snap for AMD64') {
-                    agent { label "snap-amd64" }
-                    steps {
-                        // mattermostSend "AMD64 Snap build Started - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)"
-                        cleanWs()
-                        checkout scm
-                        sh "snapcraft clean"
-                        sh "snapcraft"
-                    }
-                    post {
-                        success {
-                            // mattermostSend color: "good", message: "AMD64 Snap build success - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)"
-                            archiveArtifacts artifacts: '*.snap'
-                            sh "snapcraft upload --release=edge *.snap"
-                        }
-                        // failure {
-                        //     mattermostSend color: "danger", message: "AMD64 Snap build failure - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)"
-                        // }
-                    }
+                failure {
+                    jabberNotify buildToChatNotifier: [$class: 'ExtraMessageOnlyBuildToChatNotifier'], extraMessage: 'Build Failed', notifySuspects: true, targets: "${CHAT}"
                 }
             }
         }