diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index a3f598b..4217350 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -23,11 +23,11 @@ jobs:
             VERSION=${GITHUB_REF#refs/tags/}
             TAGS="$DOCKER_IMAGE:$VERSION,$DOCKER_IMAGE:latest"
           elif [[ $GITHUB_REF == refs/heads/main ]]; then
-            VERSION=$(git rev-parse --short ${{ github.sha }})
+            VERSION=main-$(git rev-parse --short ${{ github.sha }})
             TAGS="$DOCKER_IMAGE:$VERSION,$DOCKER_IMAGE:latest"
           elif [[ $GITHUB_REF == refs/heads/develop ]]; then
             VERSION=dev-$(git rev-parse --short ${{ github.sha }})
-            TAGS="$DOCKER_IMAGE:$VERSION"
+            TAGS="$DOCKER_IMAGE:$VERSION,$DOCKER_IMAGE:test"
           else
             VERSION=$(git rev-parse --short ${{ github.sha }})
             TAGS="$DOCKER_IMAGE:$VERSION"
diff --git a/pages/JoinUs.tsx b/pages/JoinUs.tsx
index b8478b1..d1713a8 100644
--- a/pages/JoinUs.tsx
+++ b/pages/JoinUs.tsx
@@ -2,7 +2,7 @@ import Layout from "../components/Layout";
 import styles from "@/styles/JoinUs/JoinUs.module.scss";
 import SubmissionForm from "@/components/JoinUs/SubmissionForm";
 
-const JoinUsEnabled = process.env.NEXT_PUBLIC_JOINUS_ENABLED === "true";
+const JoinUsEnabled = true;
 
 export default function JoinUs() {