diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml
index 4a4d8b9..84a42a1 100644
--- a/.github/workflows/commit.yml
+++ b/.github/workflows/commit.yml
@@ -7,6 +7,9 @@ jobs:
     lint:
         name: Lint
         runs-on: ubuntu-latest
+        defaults:
+            run:
+                working-directory: ./frontend
         steps:
             - name: Git checkout
               uses: actions/checkout@v3
@@ -15,6 +18,7 @@ jobs:
 
             - uses: actions/setup-node@v4
               with:
+                  cache-dependency-path: ./frontend/package-lock.json
                   node-version: 22.5
                   cache: 'npm'
 
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 4ce939d..26d7ad9 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,42 +1,67 @@
 name: Deploy
 
 on:
-  push:
-    branches: [ main ]
-  workflow_dispatch:
+    push:
+        branches: [main]
+    workflow_dispatch:
+
+env:
+    NOMAD_VERSION: 1.7.7
 
 jobs:
-  wait:
-    name: Wait for tests
-    runs-on: ubuntu-latest
-    steps:
-      - name: Wait for tests
-        uses: lewagon/wait-on-check-action@v1.3.4
-        with:
-          ref: ${{ github.ref }}
-          check-name: Lint
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          wait-interval: 10
-
-  deploy:
-    runs-on: ubuntu-latest
-    needs:
-      - wait
-
-    steps:
-    - name: Git checkout
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    # See the following link for documentation:
-    # https://github.com/marketplace/actions/dokku
-    - name: Push to medusa
-      uses: dokku/github-action@v1.4.0
-      with:
-        ssh_private_key: ${{ secrets.MEDUSA_GLOBAL_DEPLOY_KEY }}
-        git_remote_url: ssh://dokku@medusa.datasektionen.se/bea
-        # force might feel risky, but there is no good reason why the server
-        # should ever not be a mirror of the deploy branch. And the errors we
-        # could get otherwise would probably be nasty to deal with
-        git_push_flags: --force
+    wait:
+        name: Wait for tests
+        runs-on: ubuntu-latest
+        steps:
+            - name: Wait for tests
+              uses: lewagon/wait-on-check-action@v1.3.4
+              with:
+                  ref: ${{ github.ref }}
+                  check-name: Lint
+                  repo-token: ${{ secrets.GITHUB_TOKEN }}
+                  wait-interval: 10
+    deploy:
+        runs-on: ubuntu-latest
+        needs:
+            - wait
+
+        steps:
+            - name: Git checkout
+              uses: actions/checkout@v4
+
+            - name: Set environment variables
+              run: |
+                  cat >> "$GITHUB_ENV" <<EOF
+                  latest=ghcr.io/${{ github.repository }}-frontend:latest
+                  current=ghcr.io/${{ github.repository }}-frontend:$(git rev-parse --short ${{ github.sha }})
+                  EOF
+
+            - name: Download Nomad
+              run: |
+                  curl -LO https://releases.hashicorp.com/nomad/${{ env.NOMAD_VERSION }}/nomad_${{ env.NOMAD_VERSION }}_linux_amd64.zip
+                  unzip -d /usr/local/bin nomad_${{ env.NOMAD_VERSION }}_linux_amd64.zip nomad
+
+            - name: Set up Docker Buildx
+              uses: docker/setup-buildx-action@v3
+
+            - name: Log in to ghcr.io
+              uses: docker/login-action@v3
+              with:
+                  registry: ghcr.io
+                  username: ${{ github.actor }}
+                  password: ${{ secrets.GITHUB_TOKEN }}
+
+            - name: Build and push
+              uses: docker/build-push-action@v5
+              with:
+                  push: true
+                  tags: ${{ env.latest }},${{ env.current }}
+                  cache-from: type=gha
+                  cache-to: type=gha,mode=max
+
+            - name: Deploy to nomad
+              env:
+                  NOMAD_ADDR: ${{ vars.NOMAD_ADDR }}
+                  NOMAD_TOKEN: ${{ secrets.NOMAD_TOKEN }}
+              run: |
+                  nomad run -var=image_tag=${{ env.current }} job.nomad.hcl
diff --git a/.gitignore b/.gitignore
index f886745..87870bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
-/node_modules
+node_modules
 /.pnp
 .pnp.js
 .yarn/install-state.gz
diff --git a/.eslintrc.json b/frontend/.eslintrc.json
similarity index 100%
rename from .eslintrc.json
rename to frontend/.eslintrc.json
diff --git a/.nvmrc b/frontend/.nvmrc
similarity index 100%
rename from .nvmrc
rename to frontend/.nvmrc
diff --git a/Dockerfile b/frontend/Dockerfile
similarity index 87%
rename from Dockerfile
rename to frontend/Dockerfile
index 0c42a98..4227d87 100644
--- a/Dockerfile
+++ b/frontend/Dockerfile
@@ -11,4 +11,4 @@ COPY next.config.mjs ./
 RUN npm run build
 
 EXPOSE 3000
-CMD ["npm", "run", "start"]
\ No newline at end of file
+CMD ["npm", "run", "start"]
diff --git a/next.config.mjs b/frontend/next.config.mjs
similarity index 100%
rename from next.config.mjs
rename to frontend/next.config.mjs
diff --git a/package-lock.json b/frontend/package-lock.json
similarity index 100%
rename from package-lock.json
rename to frontend/package-lock.json
diff --git a/package.json b/frontend/package.json
similarity index 100%
rename from package.json
rename to frontend/package.json
diff --git a/src/app/(main)/about/data.ts b/frontend/src/app/(main)/about/data.ts
similarity index 100%
rename from src/app/(main)/about/data.ts
rename to frontend/src/app/(main)/about/data.ts
diff --git a/src/app/(main)/about/helpers.ts b/frontend/src/app/(main)/about/helpers.ts
similarity index 100%
rename from src/app/(main)/about/helpers.ts
rename to frontend/src/app/(main)/about/helpers.ts
diff --git a/src/app/(main)/about/page.module.css b/frontend/src/app/(main)/about/page.module.css
similarity index 100%
rename from src/app/(main)/about/page.module.css
rename to frontend/src/app/(main)/about/page.module.css
diff --git a/src/app/(main)/about/page.tsx b/frontend/src/app/(main)/about/page.tsx
similarity index 100%
rename from src/app/(main)/about/page.tsx
rename to frontend/src/app/(main)/about/page.tsx
diff --git a/src/app/(main)/about/types.ts b/frontend/src/app/(main)/about/types.ts
similarity index 100%
rename from src/app/(main)/about/types.ts
rename to frontend/src/app/(main)/about/types.ts
diff --git a/src/app/(main)/layout.tsx b/frontend/src/app/(main)/layout.tsx
similarity index 100%
rename from src/app/(main)/layout.tsx
rename to frontend/src/app/(main)/layout.tsx
diff --git a/src/app/(main)/meta/page.tsx b/frontend/src/app/(main)/meta/page.tsx
similarity index 100%
rename from src/app/(main)/meta/page.tsx
rename to frontend/src/app/(main)/meta/page.tsx
diff --git a/src/app/(main)/page.module.css b/frontend/src/app/(main)/page.module.css
similarity index 100%
rename from src/app/(main)/page.module.css
rename to frontend/src/app/(main)/page.module.css
diff --git a/src/app/(main)/page.tsx b/frontend/src/app/(main)/page.tsx
similarity index 100%
rename from src/app/(main)/page.tsx
rename to frontend/src/app/(main)/page.tsx
diff --git a/src/app/(main)/schedule/page.tsx b/frontend/src/app/(main)/schedule/page.tsx
similarity index 100%
rename from src/app/(main)/schedule/page.tsx
rename to frontend/src/app/(main)/schedule/page.tsx
diff --git a/src/app/(main)/stadrutiner/page.tsx b/frontend/src/app/(main)/stadrutiner/page.tsx
similarity index 100%
rename from src/app/(main)/stadrutiner/page.tsx
rename to frontend/src/app/(main)/stadrutiner/page.tsx
diff --git a/src/app/clicker/components/Cookie.module.css b/frontend/src/app/clicker/components/Cookie.module.css
similarity index 100%
rename from src/app/clicker/components/Cookie.module.css
rename to frontend/src/app/clicker/components/Cookie.module.css
diff --git a/src/app/clicker/components/Cookie.tsx b/frontend/src/app/clicker/components/Cookie.tsx
similarity index 100%
rename from src/app/clicker/components/Cookie.tsx
rename to frontend/src/app/clicker/components/Cookie.tsx
diff --git a/src/app/clicker/components/utils.ts b/frontend/src/app/clicker/components/utils.ts
similarity index 100%
rename from src/app/clicker/components/utils.ts
rename to frontend/src/app/clicker/components/utils.ts
diff --git a/src/app/clicker/helpers.ts b/frontend/src/app/clicker/helpers.ts
similarity index 100%
rename from src/app/clicker/helpers.ts
rename to frontend/src/app/clicker/helpers.ts
diff --git a/src/app/clicker/layout.tsx b/frontend/src/app/clicker/layout.tsx
similarity index 100%
rename from src/app/clicker/layout.tsx
rename to frontend/src/app/clicker/layout.tsx
diff --git a/src/app/clicker/page.module.css b/frontend/src/app/clicker/page.module.css
similarity index 100%
rename from src/app/clicker/page.module.css
rename to frontend/src/app/clicker/page.module.css
diff --git a/src/app/clicker/page.tsx b/frontend/src/app/clicker/page.tsx
similarity index 100%
rename from src/app/clicker/page.tsx
rename to frontend/src/app/clicker/page.tsx
diff --git a/src/app/clicker/server.ts b/frontend/src/app/clicker/server.ts
similarity index 100%
rename from src/app/clicker/server.ts
rename to frontend/src/app/clicker/server.ts
diff --git a/src/app/favicon.ico b/frontend/src/app/favicon.ico
similarity index 100%
rename from src/app/favicon.ico
rename to frontend/src/app/favicon.ico
diff --git a/src/app/globals.css b/frontend/src/app/globals.css
similarity index 100%
rename from src/app/globals.css
rename to frontend/src/app/globals.css
diff --git a/src/app/laskkyl/Gif.tsx b/frontend/src/app/laskkyl/Gif.tsx
similarity index 100%
rename from src/app/laskkyl/Gif.tsx
rename to frontend/src/app/laskkyl/Gif.tsx
diff --git a/src/app/laskkyl/page.module.css b/frontend/src/app/laskkyl/page.module.css
similarity index 100%
rename from src/app/laskkyl/page.module.css
rename to frontend/src/app/laskkyl/page.module.css
diff --git a/src/app/laskkyl/page.tsx b/frontend/src/app/laskkyl/page.tsx
similarity index 100%
rename from src/app/laskkyl/page.tsx
rename to frontend/src/app/laskkyl/page.tsx
diff --git a/src/app/laskkyl/server.ts b/frontend/src/app/laskkyl/server.ts
similarity index 100%
rename from src/app/laskkyl/server.ts
rename to frontend/src/app/laskkyl/server.ts
diff --git a/src/app/laskkyl/types.ts b/frontend/src/app/laskkyl/types.ts
similarity index 100%
rename from src/app/laskkyl/types.ts
rename to frontend/src/app/laskkyl/types.ts
diff --git a/src/app/layout.tsx b/frontend/src/app/layout.tsx
similarity index 100%
rename from src/app/layout.tsx
rename to frontend/src/app/layout.tsx
diff --git a/src/app/utils/functions.ts b/frontend/src/app/utils/functions.ts
similarity index 100%
rename from src/app/utils/functions.ts
rename to frontend/src/app/utils/functions.ts
diff --git a/src/components/ClickPopup.module.css b/frontend/src/components/ClickPopup.module.css
similarity index 100%
rename from src/components/ClickPopup.module.css
rename to frontend/src/components/ClickPopup.module.css
diff --git a/src/components/ClickPopup.tsx b/frontend/src/components/ClickPopup.tsx
similarity index 100%
rename from src/components/ClickPopup.tsx
rename to frontend/src/components/ClickPopup.tsx
diff --git a/src/components/FloorPlan.module.css b/frontend/src/components/FloorPlan.module.css
similarity index 100%
rename from src/components/FloorPlan.module.css
rename to frontend/src/components/FloorPlan.module.css
diff --git a/src/components/FloorPlan.tsx b/frontend/src/components/FloorPlan.tsx
similarity index 100%
rename from src/components/FloorPlan.tsx
rename to frontend/src/components/FloorPlan.tsx
diff --git a/src/components/Header.module.css b/frontend/src/components/Header.module.css
similarity index 100%
rename from src/components/Header.module.css
rename to frontend/src/components/Header.module.css
diff --git a/src/components/Header.tsx b/frontend/src/components/Header.tsx
similarity index 100%
rename from src/components/Header.tsx
rename to frontend/src/components/Header.tsx
diff --git a/src/components/Info.module.css b/frontend/src/components/Info.module.css
similarity index 100%
rename from src/components/Info.module.css
rename to frontend/src/components/Info.module.css
diff --git a/src/components/Info.tsx b/frontend/src/components/Info.tsx
similarity index 100%
rename from src/components/Info.tsx
rename to frontend/src/components/Info.tsx
diff --git a/src/components/NavBar.module.css b/frontend/src/components/NavBar.module.css
similarity index 100%
rename from src/components/NavBar.module.css
rename to frontend/src/components/NavBar.module.css
diff --git a/src/components/NavBar.tsx b/frontend/src/components/NavBar.tsx
similarity index 100%
rename from src/components/NavBar.tsx
rename to frontend/src/components/NavBar.tsx
diff --git a/src/components/Profile.module.css b/frontend/src/components/Profile.module.css
similarity index 100%
rename from src/components/Profile.module.css
rename to frontend/src/components/Profile.module.css
diff --git a/src/components/Profile.tsx b/frontend/src/components/Profile.tsx
similarity index 100%
rename from src/components/Profile.tsx
rename to frontend/src/components/Profile.tsx
diff --git a/src/components/ProfileAgg.tsx b/frontend/src/components/ProfileAgg.tsx
similarity index 100%
rename from src/components/ProfileAgg.tsx
rename to frontend/src/components/ProfileAgg.tsx
diff --git a/src/components/ScrollTop.module.css b/frontend/src/components/ScrollTop.module.css
similarity index 100%
rename from src/components/ScrollTop.module.css
rename to frontend/src/components/ScrollTop.module.css
diff --git a/src/components/ScrollTop.tsx b/frontend/src/components/ScrollTop.tsx
similarity index 100%
rename from src/components/ScrollTop.tsx
rename to frontend/src/components/ScrollTop.tsx
diff --git a/tsconfig.json b/frontend/tsconfig.json
similarity index 100%
rename from tsconfig.json
rename to frontend/tsconfig.json
diff --git a/job.nomad.hcl b/job.nomad.hcl
new file mode 100644
index 0000000..23e258b
--- /dev/null
+++ b/job.nomad.hcl
@@ -0,0 +1,46 @@
+job "bea" {
+  type = "service"
+
+  group "bea" {
+    network {
+      port "http-frontend" { 
+        to = 3000 
+      }
+    }
+
+    service {
+      name     = "bea-frontend"
+      port     = "http"
+      provider = "nomad"
+      tags = [
+        "traefik.enable=true",
+        "traefik.http.routers.bea.rule=Host(`metadorerna.se`)",
+        "traefik.http.routers.bea.tls.certresolver=default",
+      ]
+    }
+
+    task "bea-frontend" {
+      driver = "docker"
+
+      config {
+        image = var.image_tag-frontend
+        ports = ["http"]
+      }
+
+      template {
+        data        = "PORT={{ env \"NOMAD_PORT_http-frontend\" }}"
+        destination = "local/.env"
+        env         = true
+      }
+
+      resources {
+        memory = 100
+      }
+    }
+  }
+}
+
+variable "image_tag-frontend" {
+  type = string
+  default = "ghcr.io/datasektionen/bea-frontend:latest"
+}
\ No newline at end of file