diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index b290255..e3d71c4 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -1,8 +1,20 @@
 {
+  "permissions": {
+    "allow": [
+      "mcp__serena__read_file",
+      "mcp__serena__search_for_pattern",
+      "mcp__serena__find_file",
+      "mcp__serena__list_dir",
+      "mcp__serena__think_about_collected_information",
+      "Bash(git add:*)",
+      "Bash(git commit:*)",
+      "mcp__serena__replace_regex"
+    ]
+  },
+  "enableAllProjectMcpServers": true,
   "enabledMcpjsonServers": [
     "serena",
     "context7",
     "git"
-  ],
-  "enableAllProjectMcpServers": true
+  ]
 }
diff --git a/.mcp.json b/.mcp.json
index ad2686c..741d00e 100644
--- a/.mcp.json
+++ b/.mcp.json
@@ -1,28 +1,33 @@
 {
   "mcpServers": {
     "serena": {
-      "command": "uvx",
-      "args": [
-        "--from",
-        "git+https://github.com/oraios/serena",
-        "serena",
-        "start-mcp-server",
-        "--enable-web-dashboard",
-        "false"
-      ]
+      "command": "docker",
+     "args": [
+        "run",
+        "--rm",
+        "-i",
+        "--network", "host",
+        "-v", "./:/workspaces/projects",
+        "ghcr.io/oraios/serena:0.1.4",
+        "serena", "start-mcp-server",
+        "--transport", "stdio",
+        "--project", "/workspaces/projects",
+        "--enable-web-dashboard", "false"
+      ],
+      "autoApprove": {
+        "commands": [
+          "search_for_pattern",
+          "read_file",
+          "find_file",
+          "list_dir",
+          "think_about_collected_information",
+          "replace_regex"
+        ]
+      }
     },
     "context7": {
       "type": "http",
       "url": "https://mcp.context7.com/mcp"
-    },
-    "git": {
-      "command": "uvx",
-      "args": [
-        "mcp-server-git"
-      ],
-      "env": {
-        "MCP_GIT_ALLOW": "/home/knee-cola/web-pro/evidencija-rezija"
-      }
     }
   }
 }
\ No newline at end of file
diff --git a/app/lib/actions/billActions.ts b/app/lib/actions/billActions.ts
index 3a5de12..98ae03b 100644
--- a/app/lib/actions/billActions.ts
+++ b/app/lib/actions/billActions.ts
@@ -2,7 +2,7 @@
 
 import { z } from 'zod';
 import { getDbClient } from '../dbClient';
-import { Bill, BillAttachment, BillingLocation, YearMonth } from '../db-types';
+import { Bill, BilledTo, BillAttachment, BillingLocation, YearMonth } from '../db-types';
 import { ObjectId } from 'mongodb';
 import { withUser } from '@/app/lib/auth';
 import { AuthenticatedUser } from '../types/next-auth';
@@ -145,6 +145,7 @@ export const updateOrAddBill = withUser(async (user:AuthenticatedUser, locationI
     } = validatedFields.data;
 
     const billPaid = formData.get('billPaid') === 'on';
+    const billedTo = (formData.get('billedTo') as BilledTo) ?? BilledTo.Tenant;
     const barcodeImage = formData.get('barcodeImage')?.valueOf() as string;
 
     // update the bill in the mongodb
@@ -159,6 +160,7 @@ export const updateOrAddBill = withUser(async (user:AuthenticatedUser, locationI
         const mongoDbSet = billAttachment ? {
             "bills.$[elem].name": billName,
             "bills.$[elem].paid": billPaid,
+            "bills.$[elem].billedTo": billedTo,
             "bills.$[elem].attachment": billAttachment,
             "bills.$[elem].notes": billNotes,
             "bills.$[elem].payedAmount": payedAmount,
@@ -167,6 +169,7 @@ export const updateOrAddBill = withUser(async (user:AuthenticatedUser, locationI
         }: {
             "bills.$[elem].name": billName,
             "bills.$[elem].paid": billPaid,
+            "bills.$[elem].billedTo": billedTo,
             "bills.$[elem].notes": billNotes,
             "bills.$[elem].payedAmount": payedAmount,
             "bills.$[elem].barcodeImage": barcodeImage,
@@ -191,6 +194,7 @@ export const updateOrAddBill = withUser(async (user:AuthenticatedUser, locationI
             _id: (new ObjectId()).toHexString(),
             name: billName,
             paid: billPaid,
+            billedTo: billedTo,
             attachment: billAttachment,
             notes: billNotes,
             payedAmount,
@@ -254,6 +258,7 @@ export const updateOrAddBill = withUser(async (user:AuthenticatedUser, locationI
                                             _id: (new ObjectId()).toHexString(),
                                             name: billName,
                                             paid: false, // New bills in subsequent months are unpaid
+                                            billedTo: BilledTo.Tenant, // Default to tenant for subsequent months
                                             attachment: null, // No attachment for subsequent months
                                             notes: billNotes,
                                             payedAmount: null,
diff --git a/app/lib/actions/printActions.ts b/app/lib/actions/printActions.ts
index 45616b2..6a3756f 100644
--- a/app/lib/actions/printActions.ts
+++ b/app/lib/actions/printActions.ts
@@ -1,7 +1,7 @@
 'use server';
 
 import { getDbClient } from '../dbClient';
-import { BillingLocation, Bill } from '../db-types';
+import { BilledTo, BillingLocation, Bill } from '../db-types';
 import { AuthenticatedUser } from '../types/next-auth';
 import { withUser } from '../auth';
 import { unstable_noStore as noStore } from 'next/cache';
@@ -41,7 +41,8 @@ export const fetchBarcodeDataForPrint = withUser(async (user: AuthenticatedUser,
 
     for (const location of locations) {
         for (const bill of location.bills) {
-            if (bill.barcodeImage && bill.barcodeImage.trim() !== "") {
+            // Only include bills that are billed to tenant and have barcode images
+            if (bill.barcodeImage && bill.barcodeImage.trim() !== "" && (bill.billedTo ?? BilledTo.Tenant) === BilledTo.Tenant) {
                 printData.push({
                     locationName: location.name,
                     billName: bill.name,
diff --git a/app/lib/db-types.ts b/app/lib/db-types.ts
index d9d6cc8..dc63601 100644
--- a/app/lib/db-types.ts
+++ b/app/lib/db-types.ts
@@ -31,6 +31,11 @@ export interface BillingLocation {
     notes: string|null;
 };
 
+export enum BilledTo {
+    Tenant = "tenant",
+    Landlord = "landlord"
+}
+
 /** Bill basic data */
 export interface Bill {
     _id: string;
@@ -38,6 +43,8 @@ export interface Bill {
     name: string;
     /** is the bill paid */
     paid: boolean;
+    /** who is billed for the bill */
+    billedTo?: BilledTo;
     /** payed amount amount in cents */
     payedAmount?: number | null;
     /** attached document (optional) */
diff --git a/app/ui/BillEditForm.tsx b/app/ui/BillEditForm.tsx
index 29a61a1..08343b8 100644
--- a/app/ui/BillEditForm.tsx
+++ b/app/ui/BillEditForm.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { DocumentIcon, TrashIcon } from "@heroicons/react/24/outline";
-import { Bill, BillingLocation } from "../lib/db-types";
+import { Bill, BilledTo, BillingLocation } from "../lib/db-types";
 import React, { FC } from "react";
 import { useFormState } from "react-dom";
 import { updateOrAddBill } from "../lib/actions/billActions";
@@ -29,7 +29,7 @@ export const BillEditForm:FC<BillEditFormProps> = ({ location, bill }) => {
     const t = useTranslations("bill-edit-form");
     const locale = useLocale();
 
-    const { _id: billID, name, paid, attachment, notes, payedAmount: initialPayedAmount, barcodeImage: initialBarcodeImage } = bill ?? { _id:undefined, name:"", paid:false, notes:"" };
+    const { _id: billID, name, paid, billedTo = BilledTo.Tenant, attachment, notes, payedAmount: initialPayedAmount, barcodeImage: initialBarcodeImage } = bill ?? { _id:undefined, name:"", paid:false, notes:"" };
 
     const { yearMonth:{year: billYear, month: billMonth}, _id: locationID } = location;
 
@@ -40,10 +40,16 @@ export const BillEditForm:FC<BillEditFormProps> = ({ location, bill }) => {
     const [ isScanningPDF, setIsScanningPDF ] = React.useState<boolean>(false);
     const [ state, dispatch ] = useFormState(handleAction, initialState);
     const [ isPaid, setIsPaid ] = React.useState<boolean>(paid);
+    const [ billedToValue, setBilledToValue ] = React.useState<BilledTo>(billedTo);
     const [ payedAmount, setPayedAmount ] = React.useState<string>(initialPayedAmount ? `${initialPayedAmount/100}` : "" );
     const [ barcodeImage, setBarcodeImage ] = React.useState<string | undefined>(initialBarcodeImage);
     const [ barcodeResults, setBarcodeResults ] = React.useState<Array<DecodeResult> | null>(null);
 
+
+    const billedTo_handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        setBilledToValue(event.target.value as BilledTo);
+    }
+
     const billPaid_handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
         setIsPaid(event.target.checked);
     }
@@ -202,9 +208,37 @@ export const BillEditForm:FC<BillEditFormProps> = ({ location, bill }) => {
                     ))}
                 </div>
 
+                <div className="form-control mt-4">
+                    <div className="flex items-center gap-4">
+                        <span className="label-text">{t("billed-to-label")}</span>
+                        <label className="label cursor-pointer gap-2">
+                            <input 
+                                type="radio" 
+                                name="billedTo" 
+                                value={BilledTo.Tenant}
+                                className="radio radio-primary" 
+                                checked={billedToValue === BilledTo.Tenant} 
+                                onChange={billedTo_handleChange} 
+                            />
+                            <span className="label-text">{t("billed-to-tenant-option")}</span>
+                        </label>
+                        <label className="label cursor-pointer gap-2">
+                            <input 
+                                type="radio" 
+                                name="billedTo" 
+                                value={BilledTo.Landlord}
+                                className="radio radio-primary" 
+                                checked={billedToValue === BilledTo.Landlord} 
+                                onChange={billedTo_handleChange} 
+                            />
+                            <span className="label-text">{t("billed-to-landlord-option")}</span>
+                        </label>
+                    </div>
+                </div>
+
                 {/* Show toggle only when adding a new bill (not editing) */}
                 {!bill && (
-                    <div className="form-control mt-4">
+                    <div className="form-control">
                         <label className="label cursor-pointer">
                             <span className="label-text">{t("add-to-subsequent-months")}</span> 
                             <input type="checkbox" name="addToSubsequentMonths" className="toggle toggle-primary" />
diff --git a/app/ui/HomePage.tsx b/app/ui/HomePage.tsx
index df76dc6..51584c3 100644
--- a/app/ui/HomePage.tsx
+++ b/app/ui/HomePage.tsx
@@ -1,6 +1,6 @@
 import { fetchAllLocations } from '@/app/lib/actions/locationActions';
 import { fetchAvailableYears } from '@/app/lib/actions/monthActions';
-import { BillingLocation, YearMonth } from '@/app/lib/db-types';
+import { BilledTo, BillingLocation, YearMonth } from '@/app/lib/db-types';
 import { FC } from 'react';
 import { MonthLocationList } from '@/app/ui/MonthLocationList';
 
@@ -49,7 +49,7 @@ export const HomePage:FC<HomePageProps> = async ({ searchParams }) => {
         [key]: {
           yearMonth: location.yearMonth,
           locations: [...locationsInMonth.locations, location],
-          monthlyExpense: locationsInMonth.monthlyExpense + location.bills.reduce((acc, bill) => bill.paid ? acc + (bill.payedAmount ?? 0) : acc, 0)
+          monthlyExpense: locationsInMonth.monthlyExpense + location.bills.reduce((acc, bill) => (bill.paid && (bill.billedTo ?? BilledTo.Tenant) === BilledTo.Tenant) ? acc + (bill.payedAmount ?? 0) : acc, 0)
         }
       })
     }
@@ -59,7 +59,7 @@ export const HomePage:FC<HomePageProps> = async ({ searchParams }) => {
       [key]: {
         yearMonth: location.yearMonth,
         locations: [location],
-        monthlyExpense: location.bills.reduce((acc, bill) => bill.paid ? acc + (bill.payedAmount ?? 0) : acc, 0)
+        monthlyExpense: location.bills.reduce((acc, bill) => (bill.paid && (bill.billedTo ?? BilledTo.Tenant) === BilledTo.Tenant) ? acc + (bill.payedAmount ?? 0) : acc, 0)
       }
     });
   }, {} as {[key:string]:{
diff --git a/app/ui/LocationCard.tsx b/app/ui/LocationCard.tsx
index 98a32d9..bb40638 100644
--- a/app/ui/LocationCard.tsx
+++ b/app/ui/LocationCard.tsx
@@ -3,7 +3,7 @@
 import { Cog8ToothIcon, PlusCircleIcon, ShareIcon } from "@heroicons/react/24/outline";
 import { FC } from "react";
 import { BillBadge } from "./BillBadge";
-import { BillingLocation } from "../lib/db-types";
+import { BilledTo, BillingLocation } from "../lib/db-types";
 import { formatYearMonth } from "../lib/format";
 import { formatCurrency } from "../lib/formatStrings";
 import Link from "next/link";
@@ -19,8 +19,8 @@ export const LocationCard:FC<LocationCardProps> = ({location: { _id, name, yearM
     const t = useTranslations("home-page.location-card");
     const currentLocale = useLocale();
 
-    // sum all the billAmounts
-    const monthlyExpense = bills.reduce((acc, bill) => bill.paid ? acc + (bill.payedAmount ?? 0) : acc, 0);
+    // sum all the billAmounts (only for bills billed to tenant)
+    const monthlyExpense = bills.reduce((acc, bill) => (bill.paid && (bill.billedTo ?? BilledTo.Tenant) === BilledTo.Tenant) ? acc + (bill.payedAmount ?? 0) : acc, 0);
 
     const handleCopyLinkClick = () => {
         // copy URL to clipboard
@@ -40,7 +40,7 @@ export const LocationCard:FC<LocationCardProps> = ({location: { _id, name, yearM
                 <h2 className="card-title mr-[2em] text-[1rem]">{formatYearMonth(yearMonth)} {name}</h2>
                 <div className="card-actions">
                     {
-                        bills.map(bill => <BillBadge key={`${_id}-${bill._id}`} locationId={_id} bill={bill} />)
+                        bills.filter(bill => (bill.billedTo ?? BilledTo.Tenant) === BilledTo.Tenant).map(bill => <BillBadge key={`${_id}-${bill._id}`} locationId={_id} bill={bill} />)
                     }
                     <Link href={`/bill/${_id}/add`} className="tooltip" data-tip={t("add-bill-button-tooltip")}>
                         <PlusCircleIcon className="h-[1em] w-[1em] cursor-pointer text-2xl inline-block" /><span className="ml-1 text-xs ml-[0.2rem]">{t("add-bill-button-tooltip")}</span>
diff --git a/app/ui/ViewLocationCard.tsx b/app/ui/ViewLocationCard.tsx
index 292b533..021db63 100644
--- a/app/ui/ViewLocationCard.tsx
+++ b/app/ui/ViewLocationCard.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import { FC } from "react";
-import { BillingLocation } from "../lib/db-types";
+import { BilledTo, BillingLocation } from "../lib/db-types";
 import { formatYearMonth } from "../lib/format";
 import { formatCurrency } from "../lib/formatStrings";
 import { useTranslations } from "next-intl";
@@ -15,8 +15,8 @@ export const ViewLocationCard:FC<ViewLocationCardProps> = ({location: { _id, nam
 
     const t = useTranslations("home-page.location-card");
 
-    // sum all the billAmounts
-    const monthlyExpense = bills.reduce((acc, bill) => bill.paid ? acc + (bill.payedAmount ?? 0) : acc, 0);
+    // sum all the billAmounts (only for bills billed to tenant)
+    const monthlyExpense = bills.reduce((acc, bill) => (bill.paid && (bill.billedTo ?? BilledTo.Tenant) === BilledTo.Tenant) ? acc + (bill.payedAmount ?? 0) : acc, 0);
 
     return(
         <div data-key={_id } className="card card-compact card-bordered max-w-[30em] min-w-[350px] bg-base-100 border-1 border-neutral my-1">
@@ -24,7 +24,7 @@ export const ViewLocationCard:FC<ViewLocationCardProps> = ({location: { _id, nam
                 <h2 className="card-title mr-[2em] text-[1.3rem]">{formatYearMonth(yearMonth)} {name}</h2>
                 <div className="card-actions mt-[1em] mb-[1em]">
                     {
-                        bills.map(bill => <ViewBillBadge key={`${_id}-${bill._id}`} locationId={_id} bill={bill} />)
+                        bills.filter(bill => (bill.billedTo ?? BilledTo.Tenant) === BilledTo.Tenant).map(bill => <ViewBillBadge key={`${_id}-${bill._id}`} locationId={_id} bill={bill} />)
                     }
                 </div>
                 {
diff --git a/messages/en.json b/messages/en.json
index 90aef68..8852bf1 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -103,7 +103,10 @@
       "form-error-message": "Form validation error. Please check the form and try again."
     },
     "attachment": "Attachment",
-    "back-button": "Back"
+    "back-button": "Back",
+    "billed-to-label": "Billed to",
+    "billed-to-tenant-option": "Tenant",
+    "billed-to-landlord-option": "Landlord"
   },
   "location-delete-form": {
     "text": "Please confirm deletion of realestate \"<strong>{name}</strong>\".",
diff --git a/messages/hr.json b/messages/hr.json
index bc3cae3..730a1c2 100644
--- a/messages/hr.json
+++ b/messages/hr.json
@@ -102,7 +102,10 @@
       "form-error-message": "Forma nije ispravno popunjena. Molimo provjeri, pa pokušaj ponovno"
     },
     "attachment": "Privitak",
-    "back-button": "Nazad"
+    "back-button": "Nazad",
+    "billed-to-label": "Račun plaća",
+    "billed-to-tenant-option": "Podstanar",
+    "billed-to-landlord-option": "Vlasnik"
   },
   "location-delete-form": {
     "text": "Molim potvrdi brisanje nekretnine \"<strong>{name}</strong>\".",