diff --git a/Development/Jira/docker-compose.yml b/Development/Jira/docker-compose.yml
new file mode 100644
index 0000000..8acaec4
--- /dev/null
+++ b/Development/Jira/docker-compose.yml
@@ -0,0 +1,50 @@
+version: '3.8'
+
+services:
+
+#Jira
+  Jira:
+    depends_on:
+      - 'postgresql'
+    image: atlassian/jira-software:latest
+    container_name: Jira
+    environment:
+      VIRTUAL_HOST: localhost
+      CATALINA_OPTS: '-Xms1024m -Xmx2048m -XX:+UseG1GC -Datlassian.plugins.enable.wait=300'
+      X_PROXY_NAME: jira.luke-else.co.uk
+      X_PROXY_PORT: 443
+      X_PROXY_SCHEME: https
+    networks:
+      - Jira
+      - Development
+    ports:
+      - '8080:8080'
+    volumes:
+      - ./jira:/var/atlassian/jira
+    restart: unless-stopped
+
+#Postgres database
+  postgresql:
+    image: sameersbn/postgresql:latest
+    container_name: postgresql
+    environment:
+      - DEBUG=false
+      - DB_USER=jira
+      - DB_PASS=password
+      - DB_NAME=jiradb
+      - DB_EXTENSION=pg_trgm
+    volumes:
+      - ./postgresql:/var/lib/postgresql
+    networks:
+      - jira
+    restart: unless-stopped
+
+volumes:
+  jiradata:
+    external: false
+  postgresqldata_jira:
+    external: false
+
+networks:
+  jira:
+    driver: bridge
\ No newline at end of file
diff --git a/Gitea/docker-compose.yml b/Gitea/docker-compose.yml
deleted file mode 100644
index 61681d9..0000000
--- a/Gitea/docker-compose.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-version: '3.8'
-
-services:
-
-#gitea (222)
-  gitea:
-    image: gitea/gitea:latest
-    container_name: gitea
-    environment:
-      - APP_NAME="gitea"
-      - USER_UID=1000
-      - USER_GID=1000
-      - USER=git
-      - RUN_MODE=prod
-      - DOMAIN=git.luke-else.co.uk
-      - SSH_DOMAIN=git.luke-else.co.uk
-      - HTTP_PORT=3000
-      - ROOT_URL=https://git.luke-else.co.uk
-      - SSH_PORT=222
-      - SSH_LISTEN_PORT=22
-      - DB_TYPE=sqlite3
-    ports:
-      - "222:22"
-    volumes:
-      - ./gitea:/data
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-    restart: unless-stopped
\ No newline at end of file