diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index 702ce18..b1ee8dc 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -4,7 +4,6 @@ on:
     branches:
       - main
       - develop
-      - features/**
 
 jobs:
   laravel-tests:
diff --git a/.github/workflows/psr12-phpstan.yml b/.github/workflows/psr12-phpstan.yml
index e10bde4..077c80c 100644
--- a/.github/workflows/psr12-phpstan.yml
+++ b/.github/workflows/psr12-phpstan.yml
@@ -69,6 +69,7 @@ jobs:
 
       - name: Execute Code Static Analysis (PHP Stan + Larastan)
         run: |
+          composer require --dev nunomaduro/larastan
           vendor/bin/phpstan analyse app -c ./vendor/nunomaduro/larastan/extension.neon  --level=4 --no-progress
 
 
diff --git a/.github/workflows/test-mysql.yml b/.github/workflows/test-mysql.yml
new file mode 100644
index 0000000..ad6b111
--- /dev/null
+++ b/.github/workflows/test-mysql.yml
@@ -0,0 +1,120 @@
+# GithHub Actions Workflow generated with Ghygen
+# Original configuration: http://gh-actions-yaml-generator.test?code=8fc497996543799704fb7f0b861d766f
+name: Test Mysql
+on:
+  push:
+    branches:
+      - main
+      - develop
+      - features/**
+
+jobs:
+  laravel-tests:
+    runs-on: ubuntu-latest
+    # Service container Mysql mysql
+    services:
+      # Label used to access the service container
+      mysql:
+        # Docker Hub image (also with version)
+        image: mysql:5.7
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_DATABASE:  db_test_laravel
+        ## map the "external" 33306 port with the "internal" 3306
+        ports:
+          - 33306:3306
+        # Set health checks to wait until mysql database has started (it takes some seconds to start)
+        options: >-
+          --health-cmd="mysqladmin ping"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=3
+
+    strategy:
+      matrix:
+        operating-system: [ubuntu-latest]
+        php-versions: [ '7.4' ]
+        dependency-stability: [ prefer-stable ]
+
+    name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: '14.x'
+      - name: Cache node_modules directory
+        uses: actions/cache@v2
+        id: node_modules-cache
+        with:
+          path: node_modules
+          key: ${{ runner.OS }}-build-${{ hashFiles('**/package.json') }}-${{ hashFiles('**/package-lock.json') }}
+      - name: Install NPM packages
+        if: steps.node_modules-cache.outputs.cache-hit != 'true'
+        run: npm ci
+      - name: Build frontend
+        run: npm run development
+      - name: Install PHP versions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+      - name: Get Composer Cache Directory 2
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - uses: actions/cache@v2
+        id: actions-cache
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+      - name: Cache PHP dependencies
+        uses: actions/cache@v2
+        id: vendor-cache
+        with:
+          path: vendor
+          key: ${{ runner.OS }}-build-${{ hashFiles('**/composer.lock') }}
+      - name: Copy .env
+        run: php -r "file_exists('.env') || copy('.env.example', '.env');"
+      - name: Install Dependencies
+        if: steps.vendor-cache.outputs.cache-hit != 'true'
+        run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+
+      - name: Generate key
+        run: php artisan key:generate
+      - name: Directory Permissions
+        run: chmod -R 777 storage bootstrap/cache
+      - name: Run Migrations
+        # Set environment
+        env:
+          DB_CONNECTION: mysql
+          DB_DATABASE: db_test_laravel
+          DB_PORT: 33306
+          DB_USER: root
+
+        run: php artisan migrate
+
+      - name: Show Laravel versions
+        run: php artisan --version
+      - name: Show dir
+        run: pwd
+      - name: PHP Version
+        run: php --version
+
+      - name: Execute tests (Unit and Feature tests) via PHPUnit
+        # Set environment
+        env:
+          DB_CONNECTION: mysql
+          DB_DATABASE: db_test_laravel
+          DB_PORT: 33306
+          DB_USER: root
+
+        run: vendor/bin/phpunit --testdox
+
+
+
+
+
+
diff --git a/.github/workflows/test-postgresql.yml b/.github/workflows/test-postgresql.yml
new file mode 100644
index 0000000..87e8df7
--- /dev/null
+++ b/.github/workflows/test-postgresql.yml
@@ -0,0 +1,123 @@
+# GithHub Actions Workflow generated with Ghygen
+# Original configuration: http://gh-actions-yaml-generator.test?code=98e5e699690e3ac2ae0ffe404d0ed3e9
+name: Test Postgresql
+on:
+  push:
+    branches:
+      - main
+      - develop
+      - features/**
+
+jobs:
+  laravel-tests:
+    runs-on: ubuntu-latest
+    # Service container Postgresql postgresql
+    services:
+      # Label used to access the service container
+      postgres:
+        # Docker Hub image (also with version)
+        image: postgres:latest
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB:  db_test_laravel
+        ## map the "external" 55432 port with the "internal" 5432
+        ports:
+          - 55432:5432
+        # Set health checks to wait until postgresql database has started (it takes some seconds to start)
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    strategy:
+      matrix:
+        operating-system: [ubuntu-latest]
+        php-versions: [ '8.0' ]
+        dependency-stability: [ prefer-stable ]
+
+    name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: '14.x'
+      - name: Cache node_modules directory
+        uses: actions/cache@v2
+        id: node_modules-cache
+        with:
+          path: node_modules
+          key: ${{ runner.OS }}-build-${{ hashFiles('**/package.json') }}-${{ hashFiles('**/package-lock.json') }}
+      - name: Install NPM packages
+        if: steps.node_modules-cache.outputs.cache-hit != 'true'
+        run: npm ci
+      - name: Build frontend
+        run: npm run development
+      - name: Install PHP versions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+      - name: Get Composer Cache Directory 2
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - uses: actions/cache@v2
+        id: actions-cache
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+      - name: Cache PHP dependencies
+        uses: actions/cache@v2
+        id: vendor-cache
+        with:
+          path: vendor
+          key: ${{ runner.OS }}-build-${{ hashFiles('**/composer.lock') }}
+      - name: Copy .env
+        run: php -r "file_exists('.env') || copy('.env.example', '.env');"
+      - name: Install Dependencies
+        if: steps.vendor-cache.outputs.cache-hit != 'true'
+        run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+
+      - name: Generate key
+        run: php artisan key:generate
+      - name: Directory Permissions
+        run: chmod -R 777 storage bootstrap/cache
+      - name: Run Migrations
+        # Set environment
+        env:
+          DB_CONNECTION: pgsql
+          DB_DATABASE: db_test_laravel
+          DB_PORT: 55432
+          DB_USERNAME: postgres
+          DB_PASSWORD: postgres
+
+        run: php artisan migrate
+
+      - name: Show Laravel versions
+        run: php artisan --version
+      - name: Show dir
+        run: pwd
+      - name: PHP Version
+        run: php --version
+
+      - name: Execute tests (Unit and Feature tests) via PHPUnit
+        # Set environment
+        env:
+          DB_CONNECTION: pgsql
+          DB_DATABASE: db_test_laravel
+          DB_PORT: 55432
+          DB_USERNAME: postgres
+          DB_PASSWORD: postgres
+
+        run: vendor/bin/phpunit --testdox
+
+
+
+
+
+
diff --git a/.github/workflows/test-sqlite.yml b/.github/workflows/test-sqlite.yml
index 9772d82..3028b96 100644
--- a/.github/workflows/test-sqlite.yml
+++ b/.github/workflows/test-sqlite.yml
@@ -1,5 +1,5 @@
 # GithHub Actions Workflow generated with Ghygen
-# Original configuration: http://gh-actions-yaml-generator.test?code=f6057d1792446de0d97898542edb1b7b
+# Original configuration: http://gh-actions-yaml-generator.test?code=88087e9e46cb297901790a7eb7aa424c
 name: Test Sqlite
 on:
   push:
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: [ '8.0' ]
+        php-versions: [ '7.4' ]
         dependency-stability: [ prefer-stable ]
 
     name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}
@@ -26,7 +26,14 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: '14.x'
+      - name: Cache node_modules directory
+        uses: actions/cache@v2
+        id: node_modules-cache
+        with:
+          path: node_modules
+          key: ${{ runner.OS }}-build-${{ hashFiles('**/package.json') }}-${{ hashFiles('**/package-lock.json') }}
       - name: Install NPM packages
+        if: steps.node_modules-cache.outputs.cache-hit != 'true'
         run: npm ci
       - name: Build frontend
         run: npm run development
@@ -34,6 +41,23 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
+      - name: Get Composer Cache Directory 2
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - uses: actions/cache@v2
+        id: actions-cache
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+      - name: Cache PHP dependencies
+        uses: actions/cache@v2
+        id: vendor-cache
+        with:
+          path: vendor
+          key: ${{ runner.OS }}-build-${{ hashFiles('**/composer.lock') }}
       - name: Copy .env
         run: php -r "file_exists('.env') || copy('.env.example', '.env');"
       - name: Install Dependencies
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 95415c4..2ab560c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,7 +6,6 @@ on:
     branches:
       - main
       - develop
-      - features/**
 
 jobs:
   laravel-tests:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a22575..81fcd46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 0.2.4 - WIP
 ### Add
+- Add Postgresql database
 
 ### Change
 - Fix Dashboard when some old data is loaded (isMysqlService vs dataType)
diff --git a/app/Http/Livewire/ConfiguratorForm.php b/app/Http/Livewire/ConfiguratorForm.php
index e7051e4..c30f6cd 100644
--- a/app/Http/Livewire/ConfiguratorForm.php
+++ b/app/Http/Livewire/ConfiguratorForm.php
@@ -47,6 +47,12 @@ class ConfiguratorForm extends Component
     public $mysqlVersion;
     public $mysqlDatabaseName;
     public $mysqlDatabasePort;
+    public $postgresqlDatabase;
+    public $postgresqlPasswordType; // 'skip
+    public $postgresqlPassword; // password
+    public $postgresqlVersion;
+    public $postgresqlDatabaseName;
+    public $postgresqlDatabasePort;
     public $stepEnvTemplateFile; // .env.ci
     public $stepPhpVersions; // 7.4
     public $stepNodejs; // false
@@ -76,6 +82,10 @@ class ConfiguratorForm extends Component
         'mysqlVersion' => 'exclude_unless:databaseType,' . self::DB_TYPE_MYSQL . '|required',
         'mysqlDatabaseName' => 'exclude_unless:databaseType,' . self::DB_TYPE_MYSQL . '|required',
         'mysqlDatabasePort' => 'exclude_unless:databaseType,' . self::DB_TYPE_MYSQL . '|required|integer',
+        'postgresqlVersion' => 'exclude_unless:databaseType,' . self::DB_TYPE_POSTGRESQL . '|required',
+        'postgresqlDatabaseName' => 'exclude_unless:databaseType,' . self::DB_TYPE_POSTGRESQL . '|required',
+        'postgresqlDatabasePort' => 'exclude_unless:databaseType,' . self::DB_TYPE_POSTGRESQL . '|required|integer',
+
         'matrixLaravelVersions' => 'exclude_unless:matrixLaravel,1|required',
     ];
 
@@ -94,6 +104,12 @@ private function loadDefaults()
         $this->mysqlVersion = "5.7";
         $this->mysqlDatabaseName = "db_test_laravel";
         $this->mysqlDatabasePort = 33306;
+        $this->postgresqlDatabase = "postgresql";
+        $this->postgresqlPasswordType = "hardcoded";
+        $this->postgresqlPassword = "postgres";
+        $this->postgresqlVersion = "latest";
+        $this->postgresqlDatabaseName = "db_test_laravel";
+        $this->postgresqlDatabasePort = 55432;
         $this->stepEnvTemplateFile = ".env.example";
         $this->stepPhpVersions = ["8.0", "7.4"];
         $this->stepNodejs = false;
@@ -150,6 +166,29 @@ public function mount()
                 $this->mysqlVersion = $j->mysqlVersion;
                 $this->mysqlDatabaseName = $j->mysqlDatabaseName;
                 $this->mysqlDatabasePort = $j->mysqlDatabasePort;
+                if (isset($j->postgresqlDatabase)) {
+                    $this->postgresqlDatabase = $j->postgresqlDatabase;
+                    $this->postgresqlPasswordType =
+                        isset($j->postgresqlPasswordType) ?
+                            $j->postgresqlPasswordType :
+                            $this->postgresqlPasswordType;
+                    $this->postgresqlPassword =
+                        isset($j->postgresqlPassword) ?
+                            $j->postgresqlPassword :
+                            $this->postgresqlPassword;
+                    $this->postgresqlVersion =
+                        isset($j->postgresqlVersion) ?
+                            $j->postgresqlVersion :
+                            $this->postgresqlVersion;
+                    $this->postgresqlDatabaseName =
+                        isset($j->postgresqlDatabaseName) ?
+                            $j->postgresqlDatabaseName :
+                            $this->postgresqlDatabaseName;
+                    $this->postgresqlDatabasePort =
+                        isset($j->postgresqlDatabasePort) ?
+                            $j->postgresqlDatabasePort :
+                            $this->postgresqlDatabasePort;
+                }
                 $this->stepEnvTemplateFile = $j->stepEnvTemplateFile;
                 $this->stepPhpVersions = $j->stepPhpVersions;
                 $this->stepNodejs = $j->stepNodejs;
@@ -267,6 +306,12 @@ public function submitForm()
             "mysqlDatabasePort",
             "mysqlPassword",
             "mysqlPasswordType",
+            "postgresqlDatabase",
+            "postgresqlVersion",
+            "postgresqlDatabaseName",
+            "postgresqlDatabasePort",
+            "postgresqlPassword",
+            "postgresqlPasswordType",
             "name",
             "on_push",
             "on_push_branches",
diff --git a/app/Http/Livewire/Dashboard/Daily.php b/app/Http/Livewire/Dashboard/Daily.php
index 2189fad..0eef510 100644
--- a/app/Http/Livewire/Dashboard/Daily.php
+++ b/app/Http/Livewire/Dashboard/Daily.php
@@ -13,9 +13,13 @@ class Daily extends Component
 
     public function mount()
     {
+        $date = DB::raw('DATE(`created_at`) as `date`');
+        if (config('database.default') === 'pgsql') {
+            $date = DB::raw("date_trunc('day', created_at) as date");
+        }
         $this->daily = LogConfiguration::select(array(
-            DB::raw('DATE(`created_at`) as `date`'),
-            DB::raw('count(*) as `count`')
+            $date,
+            DB::raw('count(*) as count')
         ))
             ->groupBy('date')
             ->orderBy('date', 'DESC') // or ASC
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 3f3fb27..c8614b7 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -34,12 +34,23 @@ public function isSqlite()
         return false;
     }
 
+    public function isPostgresqlService()
+    {
+        if (isset($this->configuration->databaseType)) {
+            return $this->configuration->databaseType === "postgresql";
+        }
+        return false;
+    }
+
 
     public function getDatabaseType()
     {
         if ($this->isMysqlService()) {
             return "Mysql";
         }
+        if ($this->isPostgresqlService()) {
+            return "Postgresql";
+        }
         if ($this->isSqlite()) {
             return "Sqlite";
         }
diff --git a/composer.json b/composer.json
index 1464f76..a4cd196 100644
--- a/composer.json
+++ b/composer.json
@@ -1,4 +1,3 @@
-
 {
     "name": "hifolks/gh-actions-yaml-generator",
     "type": "project",
@@ -33,7 +32,7 @@
         "laravel/sail": "^0.0.5",
         "mockery/mockery": "^1.4.2",
         "nunomaduro/collision": "^5.0",
-        "nunomaduro/larastan": "^0.6.13",
+        "nunomaduro/larastan": "^0.7.1",
         "phpunit/phpunit": "^9.3.3"
     },
     "config": {
diff --git a/composer.lock b/composer.lock
index 41c98d1..3a18a6c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "31dd63686a033e94d64736a9c3de5062",
+    "content-hash": "dce391128eb34e67a297951e74b3a6f9",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -1505,16 +1505,16 @@
         },
         {
             "name": "livewire/livewire",
-            "version": "v2.4.1",
+            "version": "v2.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/livewire/livewire.git",
-                "reference": "b0cb782674673a67ddfd5910d2fcb5308bb32857"
+                "reference": "2495387841a3eb03ac62b2c984ccd2574303285b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/livewire/livewire/zipball/b0cb782674673a67ddfd5910d2fcb5308bb32857",
-                "reference": "b0cb782674673a67ddfd5910d2fcb5308bb32857",
+                "url": "https://api.github.com/repos/livewire/livewire/zipball/2495387841a3eb03ac62b2c984ccd2574303285b",
+                "reference": "2495387841a3eb03ac62b2c984ccd2574303285b",
                 "shasum": ""
             },
             "require": {
@@ -1565,7 +1565,7 @@
             "description": "A front-end framework for Laravel.",
             "support": {
                 "issues": "https://github.com/livewire/livewire/issues",
-                "source": "https://github.com/livewire/livewire/tree/v2.4.1"
+                "source": "https://github.com/livewire/livewire/tree/v2.4.2"
             },
             "funding": [
                 {
@@ -1573,7 +1573,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-03-22T14:03:36+00:00"
+            "time": "2021-04-04T15:46:50+00:00"
         },
         {
             "name": "monolog/monolog",
@@ -6626,16 +6626,16 @@
         },
         {
             "name": "nunomaduro/larastan",
-            "version": "v0.6.13",
+            "version": "v0.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/larastan.git",
-                "reference": "7a047f7974e6e16d04ee038d86e2c5e6c59e9dfe"
+                "reference": "bbbe09ec16a565e6423878bd17fc4355fa0d0a4c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/larastan/zipball/7a047f7974e6e16d04ee038d86e2c5e6c59e9dfe",
-                "reference": "7a047f7974e6e16d04ee038d86e2c5e6c59e9dfe",
+                "url": "https://api.github.com/repos/nunomaduro/larastan/zipball/bbbe09ec16a565e6423878bd17fc4355fa0d0a4c",
+                "reference": "bbbe09ec16a565e6423878bd17fc4355fa0d0a4c",
                 "shasum": ""
             },
             "require": {
@@ -6650,7 +6650,7 @@
                 "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0",
                 "mockery/mockery": "^0.9 || ^1.0",
                 "php": "^7.2 || ^8.0",
-                "phpstan/phpstan": "^0.12.65",
+                "phpstan/phpstan": "0.12.81",
                 "symfony/process": "^4.3 || ^5.0"
             },
             "require-dev": {
@@ -6699,7 +6699,7 @@
             ],
             "support": {
                 "issues": "https://github.com/nunomaduro/larastan/issues",
-                "source": "https://github.com/nunomaduro/larastan/tree/v0.6.13"
+                "source": "https://github.com/nunomaduro/larastan/tree/v0.7.1"
             },
             "funding": [
                 {
@@ -6719,7 +6719,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2021-01-22T12:51:26+00:00"
+            "time": "2021-03-19T09:41:48+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -7130,16 +7130,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "0.12.83",
+            "version": "0.12.81",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "4a967cec6efb46b500dd6d768657336a3ffe699f"
+                "reference": "0dd5b0ebeff568f7000022ea5f04aa86ad3124b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/4a967cec6efb46b500dd6d768657336a3ffe699f",
-                "reference": "4a967cec6efb46b500dd6d768657336a3ffe699f",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0dd5b0ebeff568f7000022ea5f04aa86ad3124b8",
+                "reference": "0dd5b0ebeff568f7000022ea5f04aa86ad3124b8",
                 "shasum": ""
             },
             "require": {
@@ -7170,7 +7170,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/0.12.83"
+                "source": "https://github.com/phpstan/phpstan/tree/0.12.81"
             },
             "funding": [
                 {
@@ -7186,7 +7186,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-04-03T15:35:45+00:00"
+            "time": "2021-03-08T22:03:02+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
diff --git a/resources/views/action_yaml.blade.php b/resources/views/action_yaml.blade.php
index 90e98b8..2dd1939 100644
--- a/resources/views/action_yaml.blade.php
+++ b/resources/views/action_yaml.blade.php
@@ -6,6 +6,9 @@
     runs-on: ubuntu-latest
 @if ( $databaseType === "mysql" )
 @include('yaml.mysql_service')
+@endif
+@if ( $databaseType === "postgresql" )
+@include('yaml.postgresql_service')
 @endif
 
     strategy:
diff --git a/resources/views/livewire/configurator-form.blade.php b/resources/views/livewire/configurator-form.blade.php
index 68bc1e3..37c4c22 100644
--- a/resources/views/livewire/configurator-form.blade.php
+++ b/resources/views/livewire/configurator-form.blade.php
@@ -79,16 +79,16 @@
                 </div>
             </fieldset>
 
-            <fieldset class="border-2 shadow-2xl p-4 rounded-2xl" x-data="{ showMysqlService: {{ $databaseType === 'mysql' ? 'true' : 'false' }} }">
+            <fieldset class="border-2 shadow-2xl p-4 rounded-2xl" x-data="{ showMysqlService: {{ $databaseType === 'mysql' ? 'true' : 'false' }}, showPostgresqlService: {{ $databaseType === 'postgresql' ? 'true' : 'false' }} }">
               <legend class="text-xl font-medium text-gray-900 px-2 pb-2">Select Database</legend>
                 <x-form.input-select
                   model="databaseType"
                   name="databaseType"
                   label="Select the Database"
-                  :list="['none'=>'None', 'mysql'=>'MySql Service', 'sqlite' => 'Sqlite']"
+                  :list="['none'=>'None', 'mysql'=>'MySql Service', 'sqlite' => 'Sqlite', 'postgresql' => 'Postgresql']"
                   help="Database: *None* if you don't want a database in your workflow,o otherwise select Mysql or Sqlite"
                   multiselect=0
-                  onChange='showMysqlService= $event.target.value==="mysql"'>
+                  onChange='showMysqlService= $event.target.value==="mysql";showPostgresqlService= $event.target.value==="postgresql"'>
                 </x-form.input-select>
 
                 <div  x-show="showMysqlService">
@@ -142,6 +142,58 @@
                     </div>
                   </div>
                 </div>
+                <div  x-show="showPostgresqlService">
+                  <div class="md:grid md:grid-cols-3 md:gap-3" x-data="{ showInputPasswordPostgresql: {{ $postgresqlPasswordType !== 'skip' ? 'true' : 'false' }} }">
+
+                    <div class="col-span-1 ">
+                      <x-form.input-text
+                          model="postgresqlVersion"
+                          name="postgresqlVersion"
+                          label="Postgresql Version"
+                          help="Define the Postgresql Version">
+                      </x-form.input-text>
+                      @error('postgresqlVersion') <span class="flex items-center font-extrabold  tracking-wide text-red-800 bg-red-200 border-red-600 border-b-2  ">{{ $message }}</span> @enderror
+                    </div>
+                    <div class="col-span-1 ">
+                      <x-form.input-text
+                          model="postgresqlDatabaseName"
+                          name="postgresqlDatabaseName"
+                          label="Postgresql Database Name"
+                          help="Define the Postgresql database name">
+                      </x-form.input-text>
+                      @error('postgresqlDatabaseName') <span class="flex items-center font-extrabold  tracking-wide text-red-800 bg-red-200 border-red-600 border-b-2  ">{{ $message }}</span> @enderror
+                    </div>
+                    <div class="col-span-1 ">
+                      <x-form.input-text
+                          model="postgresqlDatabasePort"
+                          name="postgresqlDatabasePort"
+                          label="Postgresql Database Port"
+                          help="The Port exposed by the container, this is the external port.">
+                      </x-form.input-text>
+                      @error('postgresqlDatabasePort') <span class="flex items-center font-extrabold  tracking-wide text-red-800 bg-red-200 border-red-600 border-b-2  ">{{ $message }}</span> @enderror
+                    </div>
+                    <div class="col-span-2 ">
+                      <x-form.input-select
+                        model="postgresqlPasswordType"
+                        name="postgresqlPasswordType"
+                        label="Postgresql Password: skip, or read from secret or hardcoded"
+                        :list="['secret'=>'From Secret', 'hardcoded' => 'Hardcoded']"
+                        help="Postgresql Password: read from secret or hardcoded"
+                        multiselect=0
+                        onChange='showInputPasswordPostgresql= $event.target.value!=="skip"'>
+                      </x-form.input-select>
+                    </div>
+                    <div class="col-span-1 " x-show="showInputPasswordPostgresql">
+                        <x-form.input-text
+                          model="postgresqlPassword"
+                          name="postgresqlPassword"
+                          label="Postgresqll Password"
+                          help="For secret, fill with the name of your parameter for example DB_PASSOWORD, for Hardcoded, fill with your password (valid only for CICD, not production or stage)">
+                        </x-form.input-text>
+                    </div>
+                  </div>
+                </div>
+
             </fieldset>
 
             <fieldset class="border-2 shadow-2xl p-4 rounded-2xl">
diff --git a/resources/views/livewire/dashboard/latest.blade.php b/resources/views/livewire/dashboard/latest.blade.php
index 46d1928..945bb0b 100644
--- a/resources/views/livewire/dashboard/latest.blade.php
+++ b/resources/views/livewire/dashboard/latest.blade.php
@@ -36,6 +36,9 @@
                   @if ($l->isMysqlService() )
                     {{ $l->configuration->mysqlVersion }}
                   @endif
+                @if ($l->isPostgresqlService() )
+                  {{ $l->configuration->postgresqlVersion }}
+                @endif
               </span>
 
             </x-table.td>
diff --git a/resources/views/livewire/dashboard/top.blade.php b/resources/views/livewire/dashboard/top.blade.php
index ee2d3f1..5b3785f 100644
--- a/resources/views/livewire/dashboard/top.blade.php
+++ b/resources/views/livewire/dashboard/top.blade.php
@@ -38,6 +38,9 @@
                     @if ($l->isMysqlService() )
                       {{ $l->configuration->mysqlVersion }}
                     @endif
+                    @if ($l->isPostgresqlService() )
+                      {{ $l->configuration->postgresqlVersion }}
+                    @endif
 
                   </span>
 
diff --git a/resources/views/yaml/postgresql_service.blade.php b/resources/views/yaml/postgresql_service.blade.php
new file mode 100644
index 0000000..a4914ba
--- /dev/null
+++ b/resources/views/yaml/postgresql_service.blade.php
@@ -0,0 +1,26 @@
+@if ( $databaseType === "postgresql" )
+    # Service container Postgresql {{ $postgresqlDatabase }}
+    services:
+      # Label used to access the service container
+      postgres:
+        # Docker Hub image (also with version)
+        image: postgres:{{ $postgresqlVersion }}
+        env:
+          POSTGRES_USER: postgres
+@if ( $postgresqlPasswordType === 'secret' )
+          POSTGRES_PASSWORD: $@{{ secrets.DB_PASSWORD }}
+@endif
+@if ( $postgresqlPasswordType === 'hardcoded' )
+          POSTGRES_PASSWORD: {{ $postgresqlPassword }}
+@endif
+          POSTGRES_DB:  {{ $postgresqlDatabaseName }}
+        ## map the "external" 55432 port with the "internal" 5432
+        ports:
+          - {{ $postgresqlDatabasePort }}:5432
+        # Set health checks to wait until postgresql database has started (it takes some seconds to start)
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+@endif
diff --git a/resources/views/yaml/set_env.blade.php b/resources/views/yaml/set_env.blade.php
index 7970ac4..5b660d9 100644
--- a/resources/views/yaml/set_env.blade.php
+++ b/resources/views/yaml/set_env.blade.php
@@ -1,6 +1,6 @@
 # Set environment
       env:
-@if ( $databaseType === "mysql" )
+@if ( $databaseType === "mysql")
 @if ( $mysqlDatabase != "")
         DB_CONNECTION: {{ $mysqlDatabase }}
 @endif
@@ -19,6 +19,21 @@
 @if ( $mysqlPasswordType === 'hardcoded' )
         DB_PASSWORD: {{ $mysqlPassword }}
 @endif
+@elseif ( $databaseType === "postgresql")
+        DB_CONNECTION: pgsql
+@if ( $postgresqlDatabaseName != "")
+        DB_DATABASE: {{ $postgresqlDatabaseName }}
+@endif
+@if ( $postgresqlDatabasePort != "")
+        DB_PORT: {{ $postgresqlDatabasePort }}
+@endif
+        DB_USERNAME: postgres
+@if ( $postgresqlPasswordType === 'secret' )
+        DB_PASSWORD: $@{{ secrets.DB_PASSWORD }}
+@endif
+@if ( $postgresqlPasswordType === 'hardcoded' )
+        DB_PASSWORD: {{ $postgresqlPassword }}
+@endif
 @else
         SESSION_DRIVER: array
 @endif
diff --git a/tests/Feature/DatabaseFormTest.php b/tests/Feature/DatabaseFormTest.php
index 4660be0..2216515 100644
--- a/tests/Feature/DatabaseFormTest.php
+++ b/tests/Feature/DatabaseFormTest.php
@@ -88,6 +88,40 @@ public function test_sqlite_withmigration()
             ->assertDontSee("image: mysql:");
     }
 
+    /**
+     * Testing with sqlite database and migrations
+     * @return void
+     */
+    public function test_postgresql_withmigration()
+    {
+        Livewire::test(ConfiguratorForm::class)
+            ->set("name","Test Postgresql")
+            ->set("onPullrequest", true)
+            ->set("databaseType", "postgresql")
+            ->call('submitForm')
+            ->assertHasNoErrors('yaml')
+            ->assertCount('hints', 0)
+            ->assertSee(file_get_contents(base_path(self::DIR_MOCK."postgresql-service.yaml")))
+            ->assertDontSee("image: mysql:");
+    }
+
+    /**
+     * Testing with sqlite database and migrations
+     * @return void
+     */
+    public function test_postgresql_withnomigration()
+    {
+        Livewire::test(ConfiguratorForm::class)
+            ->set("name","Test Postgresql")
+            ->set("onPullrequest", true)
+            ->set("databaseType", "postgresql")
+            ->set("stepRunMigrations", false)
+            ->call('submitForm')
+            ->assertHasNoErrors('yaml')
+            ->assertCount('hints', 1)
+            ->assertSee(file_get_contents(base_path(self::DIR_MOCK."postgresql-service.yaml")))
+            ->assertDontSee("image: mysql:");
+    }
 
 
 }
diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php
deleted file mode 100644
index 405aea2..0000000
--- a/tests/Feature/ExampleTest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Tests\Feature;
-
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Tests\TestCase;
-
-class ExampleTest extends TestCase
-{
-    /**
-     * A basic test example.
-     *
-     * @return void
-     */
-    public function testBasicTest()
-    {
-        $response = $this->get('/');
-        $response->assertStatus(200);
-    }
-}
diff --git a/tests/Feature/PagesTest.php b/tests/Feature/PagesTest.php
new file mode 100644
index 0000000..e76019a
--- /dev/null
+++ b/tests/Feature/PagesTest.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Tests\Feature;
+
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class PagesTest extends TestCase
+{
+    use DatabaseMigrations;
+    
+    /**
+     * A basic test example.
+     *
+     * @return void
+     */
+    public function testMainPage()
+    {
+        $response = $this->get('/');
+        $response->assertStatus(200);
+    }
+    /**
+     * A basic test example.
+     *
+     * @return void
+     */
+    public function testDashboardPage()
+    {
+        $response = $this->get('/dashboard');
+        $response->assertStatus(200);
+    }
+    /**
+     * A basic test example.
+     *
+     * @return void
+     */
+    public function testAboutPage()
+    {
+        $response = $this->get('/about');
+        $response->assertStatus(200);
+    }
+    /**
+     * A basic test example.
+     *
+     * @return void
+     */
+    public function test404Page()
+    {
+        $response = $this->get('/itdoesntexist');
+        $response->assertStatus(404);
+    }
+}
diff --git a/tests/Feature/mock-asserts/postgresql-service.yaml b/tests/Feature/mock-asserts/postgresql-service.yaml
new file mode 100644
index 0000000..5fe68d7
--- /dev/null
+++ b/tests/Feature/mock-asserts/postgresql-service.yaml
@@ -0,0 +1,18 @@
+    services:
+      # Label used to access the service container
+      postgres:
+        # Docker Hub image (also with version)
+        image: postgres:latest
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB:  db_test_laravel
+        ## map the "external" 55432 port with the "internal" 5432
+        ports:
+          - 55432:5432
+        # Set health checks to wait until postgresql database has started (it takes some seconds to start)
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5