diff --git a/technologies/app/postgre-sql/README.md b/technologies/app/postgre-sql/README.md
new file mode 100644
index 00000000..0417eb09
--- /dev/null
+++ b/technologies/app/postgre-sql/README.md
@@ -0,0 +1,3 @@
+# PostgreSQL
+
+## TODO 
\ No newline at end of file
diff --git a/technologies/app/postgre-sql/postgre-sql-16.4/Dockerfile b/technologies/app/postgre-sql/postgre-sql-16.4/Dockerfile
new file mode 100644
index 00000000..a58a8a4e
--- /dev/null
+++ b/technologies/app/postgre-sql/postgre-sql-16.4/Dockerfile
@@ -0,0 +1,7 @@
+FROM postgres:16.4-bullseye
+
+ENV POSTGRES_USER=root
+ENV POSTGRES_PASSWORD=toor
+ENV POSTGRES_DB=saagie
+
+EXPOSE 5432
diff --git a/technologies/app/postgre-sql/postgre-sql-16.4/build.gradle.kts b/technologies/app/postgre-sql/postgre-sql-16.4/build.gradle.kts
new file mode 100644
index 00000000..b814e94a
--- /dev/null
+++ b/technologies/app/postgre-sql/postgre-sql-16.4/build.gradle.kts
@@ -0,0 +1,22 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright 2019-2021.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import com.bmuschko.gradle.docker.DockerRemoteApiPlugin
+import com.saagie.technologies.SaagieTechnologiesGradlePlugin
+
+apply<DockerRemoteApiPlugin>()
+apply<SaagieTechnologiesGradlePlugin>()
diff --git a/technologies/app/postgre-sql/postgre-sql-16.4/context.yaml b/technologies/app/postgre-sql/postgre-sql-16.4/context.yaml
new file mode 100644
index 00000000..bb003795
--- /dev/null
+++ b/technologies/app/postgre-sql/postgre-sql-16.4/context.yaml
@@ -0,0 +1,11 @@
+id: postgre-sql-16.4
+releaseNotes: PostgreSQL into Saagie.
+label: "16.4"
+available: true
+trustLevel: stable
+ports:
+  - port: 5432
+    name: postgre-sql
+    rewriteUrl: true
+    basePath: SAAGIE_BASE_PATH
+volumes: ["/var/lib/postgresql"]
\ No newline at end of file
diff --git a/technologies/app/postgre-sql/postgre-sql-16.4/dockerInfo.yaml b/technologies/app/postgre-sql/postgre-sql-16.4/dockerInfo.yaml
new file mode 100644
index 00000000..9d5feccf
--- /dev/null
+++ b/technologies/app/postgre-sql/postgre-sql-16.4/dockerInfo.yaml
@@ -0,0 +1,4 @@
+image: saagie/postgre-sql
+baseTag: 16.4
+dynamicVersion:
+version: 16.4
diff --git a/technologies/app/postgre-sql/postgre-sql-16.4/image_test.yaml b/technologies/app/postgre-sql/postgre-sql-16.4/image_test.yaml
new file mode 100644
index 00000000..1af61ff0
--- /dev/null
+++ b/technologies/app/postgre-sql/postgre-sql-16.4/image_test.yaml
@@ -0,0 +1,6 @@
+schemaVersion: "2.0.0"
+
+metadataTest:
+  env:
+    - key: POSTGRES_USER
+      value: root
\ No newline at end of file
diff --git a/technologies/app/postgre-sql/technology.yaml b/technologies/app/postgre-sql/technology.yaml
new file mode 100644
index 00000000..e0790233
--- /dev/null
+++ b/technologies/app/postgre-sql/technology.yaml
@@ -0,0 +1,16 @@
+version: v1
+type: APP
+id: postgre-sql
+label: PostgreSQL
+baseline: "PostgreSQL"
+description: "PostgreSQL is an open source object-relational database system."
+available: true
+icon: postgre-sql
+defaultResources: 
+  cpu: 
+    limit: 1
+  memory:
+    limit: 16 GiB
+backgroundColor: "#326690"
+customFlags: []
+readme: /technologies/app/postgre-sql
\ No newline at end of file