diff --git a/apps/backend/src/auth/auth.controller.ts b/apps/backend/src/auth/auth.controller.ts
index 942e227..f934052 100644
--- a/apps/backend/src/auth/auth.controller.ts
+++ b/apps/backend/src/auth/auth.controller.ts
@@ -86,6 +86,7 @@ export class AuthController {
 
   @Post('/signup')
   async createUser(@Body() signUpDto: SignUpDto): Promise<User> {
+    console.log(`Signup request received for: ${signUpDto.email}`);
     // By default, creates a standard user
     try {
       await this.authService.signup(signUpDto);
@@ -116,6 +117,7 @@ export class AuthController {
 
   @Post('/signin')
   async signin(@Body() signInDto: SignInDto): Promise<SignInResponseDto> {
+    console.log(`Signin request received for: ${signInDto.email}`);
     try {
       return await this.authService.signin(signInDto);
     } catch (e) {
diff --git a/apps/backend/src/auth/auth.service.ts b/apps/backend/src/auth/auth.service.ts
index 5b6cc4d..ed543c1 100644
--- a/apps/backend/src/auth/auth.service.ts
+++ b/apps/backend/src/auth/auth.service.ts
@@ -27,6 +27,9 @@ export class AuthService {
   private readonly clientSecret: string;
 
   constructor() {
+    console.log(
+      `Initializing AuthService with UserPoolId: ${CognitoAuthConfig.userPoolId}, Region: ${CognitoAuthConfig.region}`,
+    );
     this.providerClient = new CognitoIdentityProviderClient({
       region: CognitoAuthConfig.region,
       credentials: {
@@ -142,7 +145,9 @@ export class AuthService {
     });
 
     try {
+      console.log(`Calling Cognito AdminInitiateAuth for ${email}`);
       const response = await this.providerClient.send(signInCommand);
+      console.log(`Cognito response received for ${email}`);
 
       return {
         accessToken: response.AuthenticationResult.AccessToken,
diff --git a/apps/backend/src/main.ts b/apps/backend/src/main.ts
index 236cf6b..6542013 100644
--- a/apps/backend/src/main.ts
+++ b/apps/backend/src/main.ts
@@ -32,7 +32,7 @@ async function bootstrap() {
     .setVersion('1.0')
     .build();
   const document = SwaggerModule.createDocument(app, config);
-  SwaggerModule.setup('api', app, document);
+  SwaggerModule.setup('api-docs', app, document);
 
   const port = process.env.PORT || 3000;
   await app.listen(port);
diff --git a/apps/frontend/src/api/apiClient.ts b/apps/frontend/src/api/apiClient.ts
index f26ea73..365ba24 100644
--- a/apps/frontend/src/api/apiClient.ts
+++ b/apps/frontend/src/api/apiClient.ts
@@ -1,7 +1,6 @@
 import axios, { type AxiosInstance } from 'axios';
 
-const defaultBaseUrl =
-  import.meta.env.VITE_API_BASE_URL ?? 'http://localhost:3001';
+const defaultBaseUrl = import.meta.env.VITE_API_BASE_URL ?? '';
 
 export type DonationCreateRequest = {
   firstName: string;
diff --git a/apps/frontend/src/containers/donations/DonationForm.tsx b/apps/frontend/src/containers/donations/DonationForm.tsx
index dd144f1..37c9dac 100644
--- a/apps/frontend/src/containers/donations/DonationForm.tsx
+++ b/apps/frontend/src/containers/donations/DonationForm.tsx
@@ -3,6 +3,7 @@ import apiClient, {
   type CreateDonationRequest,
 } from '../../api/apiClient';
 import React, { useState } from 'react';
+import { useSearchParams } from 'react-router-dom';
 import './donations.css';
 import {
   DonationFormData,
@@ -21,7 +22,12 @@ export const DonationForm: React.FC<DonationFormProps> = ({
   onError,
   onAmountChange,
 }) => {
-  const [currentStep, setCurrentStep] = useState<DonationStep>(1);
+  const [searchParams] = useSearchParams();
+  const [currentStep, setCurrentStep] = useState<DonationStep>(() => {
+    const stepParam = searchParams.get('step');
+    if (stepParam === '4') return 4;
+    return 1;
+  });
   const [formData, setFormData] = useState<DonationFormData>({
     firstName: '',
     lastName: '',
@@ -43,7 +49,9 @@ export const DonationForm: React.FC<DonationFormProps> = ({
   const [errors, setErrors] = useState<Partial<FormErrors>>({});
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [submitError, setSubmitError] = useState<string | null>(null);
-  const [receiptId, setReceiptId] = useState<string | null>(null);
+  const [receiptId, setReceiptId] = useState<string | null>(
+    searchParams.get('receiptId'),
+  );
 
   const clampStep = (value: number): DonationStep =>
     Math.max(1, Math.min(4, value)) as DonationStep;
diff --git a/apps/frontend/src/containers/donations/steps/Step4Receipt.tsx b/apps/frontend/src/containers/donations/steps/Step4Receipt.tsx
index b848e63..0f58043 100644
--- a/apps/frontend/src/containers/donations/steps/Step4Receipt.tsx
+++ b/apps/frontend/src/containers/donations/steps/Step4Receipt.tsx
@@ -30,7 +30,7 @@ const TESTIMONIAL_SLIDES = [
   },
 ];
 
-export const Step4Receipt: React.FC<Step4ReceiptProps> = () => {
+export const Step4Receipt: React.FC<Step4ReceiptProps> = ({ receiptId }) => {
   const [feedback, setFeedback] = useState('');
 
   const handleSpreadTheWord = () => {
@@ -66,6 +66,11 @@ export const Step4Receipt: React.FC<Step4ReceiptProps> = () => {
         </p>
         <div className="h-px w-20 bg-gray-300" />
       </div>
+      {receiptId && (
+        <p className="mt-2 text-center text-[12px] text-gray-400">
+          Receipt ID: {receiptId}
+        </p>
+      )}
       <div className="mt-10">
         <label className="mb-3 block text-left">
           <span className="text-black text-[16px] leading-[100%] tracking-[0] font-normal [font-family:Helvetica,Arial,sans-serif]">
diff --git a/apps/frontend/vite.config.mts b/apps/frontend/vite.config.mts
index 3c50f04..43e25c5 100644
--- a/apps/frontend/vite.config.mts
+++ b/apps/frontend/vite.config.mts
@@ -13,9 +13,20 @@ export default defineConfig({
     host: 'localhost',
     proxy: {
       '/api': {
-        target: 'http://localhost:3001',
+        target: 'http://localhost:3000',
         changeOrigin: true,
         secure: false,
+        configure: (proxy, _options) => {
+          proxy.on('error', (err, _req, _res) => {
+            console.log('proxy error', err);
+          });
+          proxy.on('proxyReq', (proxyReq, req, _res) => {
+            console.log('Sending Request to the Target:', req.method, req.url);
+          });
+          proxy.on('proxyRes', (proxyRes, req, _res) => {
+            console.log('Received Response from the Target:', proxyRes.statusCode, req.url);
+          });
+        },
       },
     },
     fs: {
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 0d4236b..23dc396 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -36,7 +36,7 @@ services:
       NX_DB_DATABASE: fcc_dev
 
       NODE_ENV: development
-      PORT: 3000
+      PORT: 3005
 
       # JWT and Auth (add secrets in prod)
       JWT_SECRET: dev-secret-change-in-prod
@@ -52,7 +52,7 @@ services:
       NX_AWS_SECRET_ACCESS_KEY: ${NX_AWS_SECRET_ACCESS_KEY}
 
     ports:
-      - '3000:3000'
+      - '3005:3005'
     depends_on:
       postgres:
         condition: service_healthy
@@ -86,7 +86,7 @@ services:
       NX_DB_DATABASE: fcc_dev
 
       NODE_ENV: development
-      PORT: 3001
+      PORT: 3000
 
       # JWT and Auth (add secrets in prod)
       JWT_SECRET: dev-secret-change-in-prod
@@ -106,7 +106,7 @@ services:
       AWS_SES_SENDER_EMAIL: ${SENDER_EMAIL}
 
     ports:
-      - '3001:3001'
+      - '3000:3000'
     depends_on:
       postgres:
         condition: service_healthy