diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
new file mode 100644
index 0000000000..68f3d552fb
--- /dev/null
+++ b/.github/workflows/cd.yml
@@ -0,0 +1,34 @@
+name: cd.yml
+on:
+  push:
+    branches: [main]
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.25.1"
+
+      - name: Build app
+        run: ./scripts/buildprod.sh
+
+      - id: 'auth'
+        uses: 'google-github-actions/auth@v2'
+        with:
+          credentials_json: '${{ secrets.GCP_CREDENTIALS }}'
+
+      - name: 'Set up Cloud SDK'
+        uses: 'google-github-actions/setup-gcloud@v3'
+
+      - name: 'Push build to Google Cloud Artifact Registry'
+        run: gcloud builds submit --tag us-central1-docker.pkg.dev/notely-478717/notely-ar-repo/notely:latest .
+
+
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000000..7baaac62e0
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,50 @@
+name: ci
+
+on:
+  pull_request:
+    branches: [main]
+
+jobs:
+  tests:
+    name: Tests
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.25.1"
+
+      - name: Install gosec
+        run: go install github.com/securego/gosec/v2/cmd/gosec@latest
+
+      - name: Run the tests
+        run: go test ./... -cover
+
+      - name: Run the security check
+        run: gosec ./...
+
+  style:
+    name: Style
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.25.1"
+
+      - name: Install staticcheck
+        run: go install honnef.co/go/tools/cmd/staticcheck@latest
+
+      - name: Check formatting
+        run: test -z $(go fmt ./...)
+
+      - name: Check linting
+        run: staticcheck ./...
\ No newline at end of file
diff --git a/README.md b/README.md
index c2bec0368b..4a9f96967b 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # learn-cicd-starter (Notely)
 
+![github actions status](https://github.com/pedroaguia8/Boot.dev-learn-cicd/actions/workflows/ci.yml/badge.svg)
+
 This repo contains the starter code for the "Notely" application for the "Learn CICD" course on [Boot.dev](https://boot.dev).
 
 ## Local Development
@@ -21,3 +23,5 @@ go build -o notely && ./notely
 *This starts the server in non-database mode.* It will serve a simple webpage at `http://localhost:8080`.
 
 You do *not* need to set up a database or any interactivity on the webpage yet. Instructions for that will come later in the course!
+
+Pedro's version of Boot.dev's Notely app.
\ No newline at end of file
diff --git a/internal/auth/auth_test.go b/internal/auth/auth_test.go
new file mode 100644
index 0000000000..8cbd9b66ba
--- /dev/null
+++ b/internal/auth/auth_test.go
@@ -0,0 +1,55 @@
+package auth
+
+import (
+	"net/http"
+	"testing"
+)
+
+func TestGetAPIKey(t *testing.T) {
+	tests := map[string]struct {
+		headers http.Header
+		want    string
+		wantErr string // Use string to check error message content
+	}{
+		"valid api key": {
+			headers: http.Header{"Authorization": []string{"ApiKey my-secret-token"}},
+			want:    "my-secret-token",
+			wantErr: "",
+		},
+		"no auth header included": {
+			headers: http.Header{},
+			want:    "",
+			wantErr: ErrNoAuthHeaderIncluded.Error(),
+		},
+		"malformed authorization header - wrong prefix": {
+			headers: http.Header{"Authorization": []string{"Bearer my-token"}},
+			want:    "",
+			wantErr: "malformed authorization header",
+		},
+		"malformed authorization header - missing key": {
+			headers: http.Header{"Authorization": []string{"ApiKey"}},
+			want:    "",
+			wantErr: "malformed authorization header",
+		},
+	}
+
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			got, err := GetAPIKey(tc.headers)
+
+			// Check the returned string value
+			if got != tc.want {
+				t.Errorf("expected: %v, got: %v", tc.want, got)
+			}
+
+			// Check the error behavior
+			if err != nil {
+				if err.Error() != tc.wantErr {
+					t.Errorf("expected error: %v, got: %v", tc.wantErr, err.Error())
+				}
+			} else if tc.wantErr != "" {
+				t.Errorf("expected error: %v, got: nil", tc.wantErr)
+			}
+		})
+	}
+}
diff --git a/json.go b/json.go
index 1e6e7985e1..d5c74cd492 100644
--- a/json.go
+++ b/json.go
@@ -30,5 +30,10 @@ func respondWithJSON(w http.ResponseWriter, code int, payload interface{}) {
 		return
 	}
 	w.WriteHeader(code)
-	w.Write(dat)
+	_, err = w.Write(dat)
+	if err != nil {
+		log.Printf("Error writing data to response: %s", err)
+		w.WriteHeader(500)
+		return
+	}
 }
diff --git a/main.go b/main.go
index 19d7366c5f..2323b0f234 100644
--- a/main.go
+++ b/main.go
@@ -7,6 +7,7 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"time"
 
 	"github.com/go-chi/chi"
 	"github.com/go-chi/cors"
@@ -89,8 +90,9 @@ func main() {
 
 	router.Mount("/v1", v1Router)
 	srv := &http.Server{
-		Addr:    ":" + port,
-		Handler: router,
+		Addr:              ":" + port,
+		Handler:           router,
+		ReadHeaderTimeout: time.Duration(5 * time.Second),
 	}
 
 	log.Printf("Serving on port: %s\n", port)