diff --git a/.github/workflows/dockerBuildX.yml b/.github/workflows/dockerBuildX.yml
index a2bf704..6554777 100644
--- a/.github/workflows/dockerBuildX.yml
+++ b/.github/workflows/dockerBuildX.yml
@@ -8,40 +8,38 @@ on:
       - "**"
 
 env:
-  IMAGE_VERSION: edge
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  docker:
+  build-and-push-image:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
     steps:
-      - name: Checkout
+      - name: GitHub Checkout
         uses: actions/checkout@v3
 
-      - name: Set up QEMU
+      - name: Docker Set up QEMU
         uses: docker/setup-qemu-action@v2
 
-      - name: Set up Docker Buildx
+      - name: Docker Set up Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Login to Docker Hub
+      - name: Docker Login
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Generate image Version
-        run: |
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            VERSION=${GITHUB_REF#refs/tags/}
-          elif [[ $GITHUB_REF == refs/heads/develop ]]; then
-            VERSION=${GITHUB_REF#refs/heads/}
-          else
-            VERSION=latest
-          fi
-
-          echo "IMAGE_VERSION=${VERSION}"
-          echo "IMAGE_VERSION=${VERSION}" >> $GITHUB_ENV
+      - name: Docker Extract metadata (tags, labels)
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
       - name: Build and push
         uses: docker/build-push-action@v4
@@ -49,4 +47,5 @@ jobs:
           context: .
           push: true
           platforms: linux/amd64,linux/arm/v7
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/ponder:${{ env.IMAGE_VERSION }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/cmd/consts.go b/cmd/consts.go
index ce6e9b8..1b779ff 100644
--- a/cmd/consts.go
+++ b/cmd/consts.go
@@ -4,4 +4,4 @@ const openai_endpoint = "https://api.openai.com/v1/"
 
 const printify_endpoint = "https://api.printify.com/v1/"
 
-const discord_BotSystemMessage = "You are a helpful assistant Discord Chat Bot"
+const discord_BotSystemMessage = "You are Ponder. Ponder is here to help you with your Discord needs. Please be respectful and courteous when interacting with Ponder. Ponder will not tolerate any form of harassment, bullying, or discrimination. If you have any questions or concerns, please let us know. Thank you for using Ponder!"
diff --git a/helm/values_development.yaml b/helm/values_development.yaml
index 8231884..ab09651 100644
--- a/helm/values_development.yaml
+++ b/helm/values_development.yaml
@@ -5,9 +5,9 @@
 replicaCount: 1
 
 image:
-  repository: disciplesofai/ponder
+  repository: ghcr.io/seemywingz/ponder
   pullPolicy: Always
-  tag: "development"
+  tag: development
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/helm/values_production.yaml b/helm/values_production.yaml
index af53544..d46b866 100644
--- a/helm/values_production.yaml
+++ b/helm/values_production.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: disciplesofai/ponder
+  repository: ghcr.io/seemywingz/ponder
   pullPolicy: Always
   tag: "v0.1.2"