diff --git a/.github/workflows/ci-tag.yml b/.github/workflows/ci-tag.yml
index bc2a066b..cabbbc12 100644
--- a/.github/workflows/ci-tag.yml
+++ b/.github/workflows/ci-tag.yml
@@ -40,6 +40,10 @@ jobs:
         id: previoustag
         uses: "WyriHaximus/github-action-get-previous-tag@v1"
 
+      - name: "set app version to env"
+        env:
+          NEXT_PUBLIC_APP_VERSION: ${{ steps.previoustag.outputs.tag }}"
+
       - name: Extract version number
         id: extract_version
         run: |
diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml
index 867e9e9e..3c5986fe 100644
--- a/.github/workflows/dev_build.yml
+++ b/.github/workflows/dev_build.yml
@@ -63,6 +63,10 @@ jobs:
       - name: Create short sha
         run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
 
+      - name: "set app version to env"
+        env:
+          NEXT_PUBLIC_APP_VERSION: v${{ github.ref_name }}-${{ env.SHORT_SHA }}"
+
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v2
diff --git a/init-db.sh b/init-db.sh
index fd4a787b..f0056d76 100644
--- a/init-db.sh
+++ b/init-db.sh
@@ -9,6 +9,7 @@ cat << EOF > .env
 DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}?schema=public
 ZT_ADDR=${ZT_ADDR}
 NEXT_PUBLIC_SITE_NAME=${NEXT_PUBLIC_SITE_NAME}
+NEXT_PUBLIC_APP_VERSION=${NEXT_PUBLIC_APP_VERSION}
 EOF
 
 until PGPASSWORD=$POSTGRES_PASSWORD psql -h "$POSTGRES_HOST" -U "$POSTGRES_USER" -c '\q'; do
diff --git a/src/components/layouts/layout.tsx b/src/components/layouts/layout.tsx
index 9fd8bb52..dec4edfd 100644
--- a/src/components/layouts/layout.tsx
+++ b/src/components/layouts/layout.tsx
@@ -1,6 +1,7 @@
 import type { ReactNode } from "react";
 import Header from "../modules/header";
 import Sidebar from "../modules/sidebar";
+import Footer from "../modules/footer";
 
 interface Props {
   children: ReactNode;
@@ -18,18 +19,7 @@ export const LayoutAuthenticated = ({ children }: Props): JSX.Element => {
         <Sidebar />
         <div className="grid w-full grid-rows-[1fr,auto]">
           {children}
-          <footer className="hidden px-4 py-6 sm:block">
-            <div className="">
-              <p className="text-center text-sm text-gray-600">
-                © Kodea Solutions {new Date().getFullYear()}. All rights
-                reserved
-                <a href="https://uavmatrix.com">
-                  {" "}
-                  by Bernt Christian Egeland / aka @sinamics
-                </a>
-              </p>
-            </div>
-          </footer>
+          <Footer />
         </div>
       </div>
     </div>
diff --git a/src/components/modules/footer.tsx b/src/components/modules/footer.tsx
new file mode 100644
index 00000000..597f84a9
--- /dev/null
+++ b/src/components/modules/footer.tsx
@@ -0,0 +1,25 @@
+import React from "react";
+
+const Footer = () => (
+  <footer className="hidden px-4 py-6 sm:block">
+    <div className="grid grid-cols-3">
+      <div></div>
+      <p className="text-center text-sm text-gray-600">
+        © Kodea Solutions {new Date().getFullYear()}. All rights reserved
+        <a href="https://uavmatrix.com">
+          {" "}
+          by Bernt Christian Egeland / aka @sinamics
+        </a>
+      </p>
+      {process.env.NEXT_PUBLIC_APP_VERSION ? (
+        <p className="text-right text-sm text-gray-600">
+          {process.env.NEXT_PUBLIC_APP_VERSION}
+        </p>
+      ) : (
+        <div></div>
+      )}
+    </div>
+  </footer>
+);
+
+export default Footer;