diff --git a/.gitignore b/.gitignore
index 66316e7c..d74fd18e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -135,4 +135,5 @@ dist
 public/uploads
 .vercel
 
+# webstorrm
 .idea
diff --git a/actions/barometer-types.ts b/actions/barometer-types.ts
new file mode 100644
index 00000000..43b215c7
--- /dev/null
+++ b/actions/barometer-types.ts
@@ -0,0 +1,18 @@
+'use server'
+
+import { connectMongoose } from '@/utils/mongoose'
+import BarometerType, { IBarometerType } from '@/models/type'
+
+export async function getType(type: string): Promise<IBarometerType> {
+  await connectMongoose()
+  const barometerType = await BarometerType.findOne({ name: { $regex: type, $options: 'i' } })
+  if (!barometerType) throw new Error('Unknown barometer type')
+  return { ...barometerType.toObject(), _id: String(barometerType._id) }
+}
+
+export async function listTypes(): Promise<IBarometerType[]> {
+  await connectMongoose()
+  return (await BarometerType.find().sort({ order: 1 })).map(res =>
+    res.toObject({ flattenObjectIds: true }),
+  )
+}
diff --git a/actions/barometers.ts b/actions/barometers.ts
new file mode 100644
index 00000000..b201b349
--- /dev/null
+++ b/actions/barometers.ts
@@ -0,0 +1,104 @@
+'use server'
+
+import { revalidatePath } from 'next/cache'
+import { connectMongoose } from '@/utils/mongoose'
+import Barometer, { IBarometer } from '@/models/barometer'
+import { cleanObject, slug as slugify, parseDate } from '@/utils/misc'
+import { SortValue } from '@/app/collection/types/[type]/types'
+import BarometerType from '@/models/type'
+import Manufacturer from '@/models/manufacturer'
+import '@/models/condition'
+
+/**
+ * Related tables to include in database response
+ */
+const dependencies = ['type', 'condition', 'manufacturer']
+
+export async function getBarometer(slug: string): Promise<IBarometer> {
+  await connectMongoose()
+  const barometer = await Barometer.findOne({ slug }).populate(dependencies)
+  if (!barometer) throw new Error('Unknown slug')
+  return barometer.toObject({ flattenObjectIds: true })
+}
+
+/**
+ * Server function which creates new barometer in the database and generates corresponding page
+ * @returns created barometer slug
+ */
+export async function createBarometer(barometerData: IBarometer) {
+  await connectMongoose()
+  const cleanData = cleanObject(barometerData)
+  const slug = slugify(cleanData.name)
+  cleanData.slug = slug
+  const newBarometer = new Barometer(cleanData)
+  await newBarometer.save()
+  revalidatePath(`/collection/items/${slug}`)
+  return slug
+}
+
+/**
+ * Server function which updates existing barometer with new data and regenerates corresponding page
+ * @returns updated barometer slug (may differ from the original)
+ */
+export async function updateBarometer(barometerData: IBarometer): Promise<string> {
+  await connectMongoose()
+  const slug = slugify(barometerData.name)
+  barometerData.slug = slug
+  await Manufacturer.findByIdAndUpdate(barometerData.manufacturer?._id, barometerData.manufacturer)
+  const updatedBarometer = await Barometer.findByIdAndUpdate(barometerData._id, barometerData)
+  if (!updatedBarometer) throw new Error('Barometer not found')
+  revalidatePath(`/collection/items/${slug}`)
+  return slug
+}
+
+export async function listBarometers(options?: {
+  type?: string
+  sort?: SortValue
+  limit?: number
+}): Promise<IBarometer[]> {
+  await connectMongoose()
+  const sortBy = options?.sort ?? 'date'
+  if (!options?.type)
+    return sortBarometers(
+      await Barometer.find()
+        .limit(options?.limit ?? 0)
+        .populate(dependencies),
+      sortBy,
+    )
+  const barometerType = await BarometerType.findOne({
+    name: { $regex: new RegExp(`^${options.type}$`, 'i') },
+  })
+  if (!barometerType) throw new Error('Unknown barometer type')
+  return sortBarometers(
+    (
+      await Barometer.find({ type: barometerType._id })
+        .limit(options.limit ?? 0)
+        .populate(dependencies)
+    ).map(res => res.toObject({ flattenObjectIds: true })),
+    sortBy,
+  )
+}
+
+function sortBarometers(barometers: IBarometer[], sortBy: SortValue | null): IBarometer[] {
+  return barometers.toSorted((a, b) => {
+    switch (sortBy) {
+      case 'manufacturer':
+        return (a.manufacturer?.name ?? '').localeCompare(b.manufacturer?.name ?? '')
+      case 'name':
+        return a.name.localeCompare(b.name)
+      case 'date': {
+        if (!a.dating || !b.dating) return 0
+        const yearA = parseDate(a.dating)?.[0]
+        const yearB = parseDate(b.dating)?.[0]
+        if (!yearA || !yearB) return 0
+        const dateA = new Date(yearA, 0, 1).getTime()
+        const dateB = new Date(yearB, 0, 1).getTime()
+        return dateA - dateB
+      }
+      case 'cat-no':
+        return a.collectionId.localeCompare(b.collectionId)
+      default:
+        return 0
+    }
+  })
+}
diff --git a/actions/conditions.ts b/actions/conditions.ts
new file mode 100644
index 00000000..6c465872
--- /dev/null
+++ b/actions/conditions.ts
@@ -0,0 +1,10 @@
+'use server'
+
+import { connectMongoose } from '@/utils/mongoose'
+import BarometerCondition, { IBarometerCondition } from '@/models/condition'
+
+export async function listConditions(): Promise<IBarometerCondition[]> {
+  await connectMongoose()
+  const conditions = await BarometerCondition.find()
+  return conditions.map(condition => condition.toObject({ flattenObjectIds: true }))
+}
diff --git a/actions/images.ts b/actions/images.ts
new file mode 100644
index 00000000..f6e98113
--- /dev/null
+++ b/actions/images.ts
@@ -0,0 +1,46 @@
+'use server'
+
+import path from 'path'
+import { v4 as uuid } from 'uuid'
+import { GetSignedUrlConfig, Storage } from '@google-cloud/storage'
+
+const decodedPrivateKey = Buffer.from(process.env.GCP_PRIVATE_KEY, 'base64').toString('utf-8')
+const storage = new Storage({
+  projectId: process.env.GCP_PROJECT_ID,
+  credentials: {
+    client_email: process.env.GCP_CLIENT_EMAIL,
+    private_key: decodedPrivateKey,
+  },
+})
+const bucket = storage.bucket(process.env.GCP_BUCKET_NAME)
+
+export async function uploadImages(files: { fileName: string; contentType: string }[]) {
+  const signedUrls = await Promise.all(
+    files.map(async ({ fileName, contentType }) => {
+      // give unique names to files
+      const extension = path.extname(fileName).toLowerCase()
+      const newFileName = uuid() + extension
+      const options: GetSignedUrlConfig = {
+        version: 'v4',
+        action: 'write',
+        expires: Date.now() + 15 * 60 * 1000, // 15 min
+        contentType,
+      }
+      const cloudFile = bucket.file(newFileName)
+      // generate signed URL for each file
+      const [signedUrl] = await cloudFile.getSignedUrl(options)
+      return {
+        signed: signedUrl,
+        public: cloudFile.publicUrl(),
+      }
+    }),
+  )
+  return signedUrls
+}
+
+// delete file from google cloud storage
+export async function deleteImage(url?: string) {
+  if (!url) throw new Error('Unknown image file')
+  const file = bucket.file(url)
+  await file.delete()
+}
diff --git a/actions/manufacturers.ts b/actions/manufacturers.ts
new file mode 100644
index 00000000..e07f5a2c
--- /dev/null
+++ b/actions/manufacturers.ts
@@ -0,0 +1,25 @@
+'use server'
+
+import { connectMongoose } from '@/utils/mongoose'
+import Manufacturer, { IManufacturer } from '@/models/manufacturer'
+import { cleanObject } from '@/utils/misc'
+
+export async function listManufacturers(): Promise<IManufacturer[]> {
+  await connectMongoose()
+  const conditions = await Manufacturer.find()
+  return conditions.map(obj => obj.toObject({ flattenObjectIds: true }))
+}
+
+export async function setManufacturer(manufData: IManufacturer): Promise<IManufacturer> {
+  await connectMongoose()
+  const cleanData = cleanObject(manufData)
+  const newManufacturer = new Manufacturer(cleanData)
+  await newManufacturer.save()
+  return newManufacturer.toObject({ flattenObjectIds: true })
+}
+
+export async function deleteManufacturer(id: string) {
+  await connectMongoose()
+  const deletedManufacturer = await Manufacturer.findByIdAndDelete(id)
+  if (!deletedManufacturer) throw new Error('Unknown manufacturer')
+}
diff --git a/app/admin/components/add-card.tsx b/app/admin/components/add-card.tsx
index 6f6313b2..62c0ef21 100644
--- a/app/admin/components/add-card.tsx
+++ b/app/admin/components/add-card.tsx
@@ -1,22 +1,22 @@
 'use client'
 
+import { useSWRConfig } from 'swr'
 import { Box, Title, Button, TextInput, Select, Textarea } from '@mantine/core'
 import { useForm } from '@mantine/form'
-import { useMutation, useQueryClient } from '@tanstack/react-query'
-import axios, { AxiosError } from 'axios'
 import { useEffect, useState } from 'react'
 import { isLength } from 'validator'
 import { showInfo, showError } from '@/utils/notification'
-import { useBarometers } from '@/app/hooks/useBarometers'
 import { FileUpload } from './file-upload'
 import { AddManufacturer } from './add-manufacturer'
 import { Dimensions } from './dimensions'
 import type { BarometerFormProps } from '../types'
-import { barometersApiRoute } from '@/app/constants'
+import { useBarometers } from '@/app/hooks/useBarometers'
+import { createBarometer } from '@/actions/barometers'
 
 export function AddCard() {
+  const { mutate } = useSWRConfig()
   const [uploadedImages, setUploadedImages] = useState<string[]>([])
-  const { condition, types, manufacturers } = useBarometers()
+  const { types, manufacturers, conditions } = useBarometers()
 
   const form = useForm<BarometerFormProps>({
     initialValues: {
@@ -35,57 +35,46 @@ export function AddCard() {
     },
   })
 
-  const queryClient = useQueryClient()
-  const { mutate } = useMutation({
-    mutationFn: async (values: BarometerFormProps) => {
+  const saveBarometer = async (values: BarometerFormProps) => {
+    try {
       const barometerWithImages = {
         ...values,
-        manufacturer: manufacturers.data.find(({ _id }) => _id === values.manufacturer),
+        manufacturer: manufacturers?.find(({ _id }) => _id === values.manufacturer),
         images: uploadedImages.map(image => image.split('/').at(-1)),
-      }
-      const { data } = await axios.post(barometersApiRoute, barometerWithImages)
-      return data
-    },
-    onSuccess: (_, { name }) => {
-      queryClient.invalidateQueries({
-        queryKey: ['barometers'],
-      })
+      } as any
+      await createBarometer(barometerWithImages)
       form.reset()
       setUploadedImages([])
-      showInfo(`Added ${name} to the database`)
-    },
-    onError: (error: AxiosError) => {
-      showError(
-        (error.response?.data as { message: string })?.message ||
-          error.message ||
-          'Error adding barometer',
-      )
-    },
-  })
+      showInfo(`Added ${values.name} to the database`)
+    } catch (error) {
+      showError(error instanceof Error ? error.message : 'Error adding barometer')
+    }
+  }
 
   // set default barometer type
   useEffect(() => {
-    if (types.data.length === 0) return
-    form.setFieldValue('type', String(types.data[0]._id))
+    if (types?.length === 0) return
+    form.setFieldValue('type', String(types?.[0]._id))
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [types.data])
+  }, [types])
 
   // set default barometer condition
   useEffect(() => {
-    if (condition.data.length === 0) return
-    form.setFieldValue('condition', String(condition.data.at(-1)?._id))
+    if (conditions?.length === 0) return
+    form.setFieldValue('condition', String(conditions?.at(-1)?._id))
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [condition.data])
+  }, [conditions])
 
   // set default manufacturer
   useEffect(() => {
     // if there are no manufacturers or manufacturer is already set, do nothing
-    if (manufacturers.data.length === 0 || form.values.manufacturer) return
-    form.setFieldValue('manufacturer', String(manufacturers.data[0]._id))
+    if (manufacturers?.length === 0 || form.values.manufacturer) return
+    form.setFieldValue('manufacturer', String(manufacturers?.[0]._id))
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [manufacturers.data])
+  }, [manufacturers])
 
   const onAddManufacturer = (id: string) => {
+    mutate('manufacturers')
     form.setFieldValue('manufacturer', id)
   }
 
@@ -94,12 +83,12 @@ export function AddCard() {
       <Title mb="lg" order={3} tt="capitalize">
         Add new barometer
       </Title>
-      <Box component="form" onSubmit={form.onSubmit(values => mutate(values))}>
+      <Box component="form" onSubmit={form.onSubmit(values => saveBarometer(values))}>
         <TextInput label="Catalogue No." required {...form.getInputProps('collectionId')} />
         <TextInput label="Title" required id="barometer-name" {...form.getInputProps('name')} />
         <TextInput label="Dating" key={form.key('dating')} {...form.getInputProps('dating')} />
         <Select
-          data={types.data.map(({ name, _id }) => ({
+          data={types?.map(({ name, _id }) => ({
             label: name,
             value: String(_id),
           }))}
@@ -109,7 +98,7 @@ export function AddCard() {
           {...form.getInputProps('type')}
         />
         <Select
-          data={manufacturers.data.map(({ name, _id }) => ({
+          data={manufacturers?.map(({ name, _id }) => ({
             label: name,
             value: _id!,
           }))}
@@ -125,7 +114,7 @@ export function AddCard() {
         />
         <Select
           label="Condition"
-          data={condition.data.map(({ name, _id }) => ({
+          data={conditions?.map(({ name, _id }) => ({
             label: name,
             value: String(_id),
           }))}
diff --git a/app/admin/components/add-manufacturer.tsx b/app/admin/components/add-manufacturer.tsx
index 10d52ed8..d9982bde 100644
--- a/app/admin/components/add-manufacturer.tsx
+++ b/app/admin/components/add-manufacturer.tsx
@@ -1,16 +1,14 @@
 'use client'
 
 import React from 'react'
-import axios, { AxiosError } from 'axios'
 import { Box, Button, TextInput, Title, Textarea, Modal, ActionIcon, Tooltip } from '@mantine/core'
 import { useDisclosure } from '@mantine/hooks'
 import { useForm } from '@mantine/form'
 import { isLength } from 'validator'
-import { useMutation, useQueryClient } from '@tanstack/react-query'
 import { IconSquareRoundedPlus } from '@tabler/icons-react'
 import { IManufacturer } from '@/models/manufacturer'
 import { showError, showInfo } from '@/utils/notification'
-import { manufacturersApiRoute } from '@/app/constants'
+import { setManufacturer } from '@/actions/manufacturers'
 
 interface AddManufacturerProps {
   onAddManufacturer: (newId: string) => void
@@ -37,27 +35,19 @@ export function AddManufacturer({ onAddManufacturer }: AddManufacturerProps) {
         isLength(val ?? '', { max: 100 }) ? null : 'Country should be shorter that 100 symbols',
     },
   })
-  const queryClient = useQueryClient()
-  const { mutate } = useMutation({
-    mutationFn: (values: IManufacturer) =>
-      axios.post(manufacturersApiRoute, values).then(({ data }) => data),
-    onSuccess: ({ id }, variables) => {
-      queryClient.invalidateQueries({
-        queryKey: ['manufacturers'],
-      })
+
+  const createManufacturer = async (values: IManufacturer) => {
+    try {
+      const { _id, name } = await setManufacturer(values)
       form.reset()
-      onAddManufacturer(id)
+      onAddManufacturer(_id!)
       close()
-      showInfo(`${variables.name} has been recorded as a manufacturer #${id ?? 0}`, 'Success')
-    },
-    onError: (error: AxiosError) => {
-      showError(
-        (error.response?.data as { message: string })?.message ||
-          error.message ||
-          'Error adding manufacturer',
-      )
-    },
-  })
+      showInfo(`${name} has been recorded as a manufacturer`, 'Success')
+    } catch (error) {
+      showError(error instanceof Error ? error.message : `Couldn't create manufacturer`)
+    }
+  }
+
   return (
     <>
       <Modal opened={opened} onClose={close} centered>
@@ -67,7 +57,7 @@ export function AddManufacturer({ onAddManufacturer }: AddManufacturerProps) {
           onSubmit={form.onSubmit((values, event) => {
             // prevent bubbling up to parent form
             event?.stopPropagation()
-            mutate(values)
+            createManufacturer(values)
           })}
         >
           <Title mb="lg" order={3}>
diff --git a/app/admin/components/file-upload.tsx b/app/admin/components/file-upload.tsx
index 737ee2f0..ba2af813 100644
--- a/app/admin/components/file-upload.tsx
+++ b/app/admin/components/file-upload.tsx
@@ -13,10 +13,8 @@ import {
   Tooltip,
 } from '@mantine/core'
 import { IconPhotoPlus, IconXboxX } from '@tabler/icons-react'
-import axios, { AxiosError } from 'axios'
-import { showError } from '@/utils/notification'
-import { FileDto, UrlDto } from '@/app/api/barometers/upload/images/types'
-import { imageUploadApiRoute } from '@/app/constants'
+import { uploadImages, deleteImage } from '@/actions/images'
+import { showError, showInfo } from '@/utils/notification'
 
 interface FileUploadProps {
   fileNames: string[]
@@ -30,60 +28,43 @@ export function FileUpload({ setFileNames, fileNames }: FileUploadProps) {
     if (!files || !Array.isArray(files) || files.length === 0) return
     setIsUploading(true)
     try {
-      const {
-        data: { urls },
-      } = await axios.post<UrlDto>(
-        imageUploadApiRoute,
-        {
-          files: files.map(file => ({
-            fileName: file.name,
-            contentType: file.type,
-          })),
-        } as FileDto,
-        { headers: { 'Content-Type': 'application/json' } },
+      const urls = await uploadImages(
+        files.map(({ name, type }) => ({
+          fileName: name,
+          contentType: type,
+        })),
       )
-      // upload all files concurrently
+      // upload all files to Google cloud concurrently
       await Promise.all(
-        urls.map(async ({ signed }, index) => {
-          const file = files[index]
-          await axios.put(signed, file, {
+        urls.map(async ({ signed }, i) => {
+          const file = files[i]
+          await fetch(signed, {
+            method: 'PUT',
+            body: file,
             headers: {
               'Content-Type': file.type,
             },
           })
         }),
       )
+      showInfo(`Uploaded ${urls.length} image${urls.length > 1 ? 's' : ''}`)
       setFileNames(old => [...old, ...urls.map(url => url.public)])
     } catch (error) {
-      const defaultErrMsg = 'Error uploading files'
-      if (error instanceof AxiosError) {
-        showError((error.response?.data as { message?: string })?.message || defaultErrMsg)
-        return
-      }
-      showError(error instanceof Error ? error.message : defaultErrMsg)
+      showError(error instanceof Error ? error.message : 'Can`t upload images')
     } finally {
       setIsUploading(false)
     }
   }
 
-  const handleDeleteFile = async (index: number) => {
-    const fileName = fileNames.at(index)?.split('/').at(-1)
+  const handleDeleteImage = async (imgUrl: string) => {
     try {
-      await axios.delete(imageUploadApiRoute, {
-        params: {
-          fileName,
-        },
-      })
-      setFileNames(old => [...old].filter((_, i) => i !== index))
+      await deleteImage(imgUrl.split('/').at(-1))
+      setFileNames(old => [...old].filter(file => file !== imgUrl))
     } catch (error) {
-      const defaultErrMsg = 'Error deleting file'
-      if (error instanceof AxiosError) {
-        showError((error.response?.data as { message?: string })?.message || defaultErrMsg)
-        return
-      }
-      showError(error instanceof Error ? error.message : defaultErrMsg)
+      showError(error instanceof Error ? error.message : `Can't delete image ${imgUrl}`)
     }
   }
+
   return (
     <Fieldset m={0} mt="0.2rem" p="sm" pt="0.3rem" legend="Images">
       <Stack gap="xs" align="flex-start">
@@ -98,7 +79,7 @@ export function FileUpload({ setFileNames, fileNames }: FileUploadProps) {
             )}
           </FileButton>
           <Group gap="0.4rem" wrap="wrap">
-            {fileNames.map((fileName, i) => (
+            {fileNames.map(fileName => (
               <Paper key={fileName} withBorder pos="relative">
                 <CloseButton
                   p={0}
@@ -110,7 +91,7 @@ export function FileUpload({ setFileNames, fileNames }: FileUploadProps) {
                   pos="absolute"
                   icon={<IconXboxX />}
                   bg="white"
-                  onClick={() => handleDeleteFile(i)}
+                  onClick={() => handleDeleteImage(fileName)}
                 />
                 <Image h="3rem" w="3rem" src={fileName} />
               </Paper>
diff --git a/app/api/barometers/[slug]/route.ts b/app/api/barometers/[slug]/route.ts
deleted file mode 100644
index 3d6bb478..00000000
--- a/app/api/barometers/[slug]/route.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { NextRequest, NextResponse } from 'next/server'
-import { connectMongoose } from '@/utils/mongoose'
-import Barometer from '@/models/barometer'
-import '@/models/type'
-import '@/models/condition'
-import '@/models/manufacturer'
-
-interface Params {
-  params: {
-    slug: string
-  }
-}
-
-export async function GET(_req: NextRequest, { params: { slug } }: Params) {
-  try {
-    await connectMongoose()
-    const barometers = await Barometer.findOne({ slug }).populate([
-      'type',
-      'condition',
-      'manufacturer',
-    ])
-    if (barometers === null) return NextResponse.json({}, { status: 404 })
-    return NextResponse.json(barometers, { status: 201 })
-  } catch (error) {
-    return NextResponse.json(
-      { message: error instanceof Error ? error.message : 'Error adding conditions' },
-      { status: 500 },
-    )
-  }
-}
diff --git a/app/api/barometers/conditions/route.ts b/app/api/barometers/conditions/route.ts
deleted file mode 100644
index f354cd1e..00000000
--- a/app/api/barometers/conditions/route.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { NextResponse } from 'next/server'
-import { connectMongoose } from '@/utils/mongoose'
-import BarometerCondition from '@/models/condition'
-
-export async function GET() {
-  try {
-    await connectMongoose()
-    const conditions = await BarometerCondition.find()
-    return NextResponse.json(conditions, { status: 201 })
-  } catch (error) {
-    return NextResponse.json(
-      { message: error instanceof Error ? error.message : 'Error getting barometer conditions' },
-      { status: 500 },
-    )
-  }
-}
diff --git a/app/api/barometers/manufacturers/[id]/route.ts b/app/api/barometers/manufacturers/[id]/route.ts
deleted file mode 100644
index 7d218848..00000000
--- a/app/api/barometers/manufacturers/[id]/route.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { NextResponse, NextRequest } from 'next/server'
-import { connectMongoose } from '@/utils/mongoose'
-import Manufacturer from '@/models/manufacturer'
-
-interface Parameters {
-  params: {
-    id: string
-  }
-}
-
-export async function DELETE(req: NextRequest, { params: { id } }: Parameters) {
-  try {
-    await connectMongoose()
-    const deletedManufacturer = await Manufacturer.findByIdAndDelete(id)
-    if (!deletedManufacturer) {
-      return NextResponse.json({ message: 'Manufacturer not found' }, { status: 404 })
-    }
-    return NextResponse.json({ message: 'Manufacturer deleted successfully' }, { status: 200 })
-  } catch (error) {
-    return NextResponse.json(
-      {
-        message: error instanceof Error ? error.message : 'Cannot delete manufacturer',
-      },
-      { status: 500 },
-    )
-  }
-}
diff --git a/app/api/barometers/manufacturers/route.ts b/app/api/barometers/manufacturers/route.ts
deleted file mode 100644
index 99991198..00000000
--- a/app/api/barometers/manufacturers/route.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { NextResponse, NextRequest } from 'next/server'
-import { connectMongoose } from '@/utils/mongoose'
-import Manufacturer, { type IManufacturer } from '@/models/manufacturer'
-import { cleanObject } from '@/utils/misc'
-
-export async function GET() {
-  try {
-    await connectMongoose()
-    const conditions = await Manufacturer.find()
-    return NextResponse.json(conditions, { status: 201 })
-  } catch (error) {
-    return NextResponse.json(
-      { message: error instanceof Error ? error.message : 'Error getting manufacturers' },
-      { status: 500 },
-    )
-  }
-}
-
-export async function POST(req: NextRequest) {
-  try {
-    await connectMongoose()
-    const manufData: IManufacturer = await req.json()
-    const cleanData = cleanObject(manufData)
-    const newManufacturer = new Manufacturer(cleanData)
-    await newManufacturer.save()
-    return NextResponse.json({ id: newManufacturer._id }, { status: 201 })
-  } catch (error) {
-    return NextResponse.json(
-      {
-        message: error instanceof Error ? error.message : 'Cannot add new manufacturer',
-      },
-      { status: 500 },
-    )
-  }
-}
diff --git a/app/api/barometers/route.ts b/app/api/barometers/route.ts
deleted file mode 100644
index 4a0dd60b..00000000
--- a/app/api/barometers/route.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import { NextRequest, NextResponse } from 'next/server'
-import { revalidatePath } from 'next/cache'
-import { connectMongoose } from '@/utils/mongoose'
-import Barometer, { IBarometer } from '@/models/barometer'
-import BarometerType from '@/models/type'
-import '@/models/condition'
-import Manufacturer from '@/models/manufacturer'
-import { cleanObject, slug as slugify, parseDate } from '@/utils/misc'
-import { SortValue } from '@/app/collection/types/[type]/types'
-
-function sortBarometers(barometers: IBarometer[], sortBy: SortValue | null): IBarometer[] {
-  return barometers.toSorted((a, b) => {
-    switch (sortBy) {
-      case 'manufacturer':
-        return (a.manufacturer?.name ?? '').localeCompare(b.manufacturer?.name ?? '')
-      case 'name':
-        return a.name.localeCompare(b.name)
-      case 'date': {
-        if (!a.dating || !b.dating) return 0
-        const yearA = parseDate(a.dating)?.[0]
-        const yearB = parseDate(b.dating)?.[0]
-        if (!yearA || !yearB) return 0
-        const dateA = new Date(yearA, 0, 1).getTime()
-        const dateB = new Date(yearB, 0, 1).getTime()
-        return dateA - dateB
-      }
-      case 'cat-no':
-        return a.collectionId.localeCompare(b.collectionId)
-      default:
-        return 0
-    }
-  })
-}
-
-/**
- * Get barometer list
- *
- * GET /api/barometers?type=type
- */
-export async function GET(req: NextRequest) {
-  try {
-    await connectMongoose()
-    const { searchParams } = req.nextUrl
-    const typeName = searchParams.get('type')
-    const sortBy = searchParams.get('sort') as SortValue | null
-    const limit = Number(searchParams.get('limit')) ?? 0
-    // if `type` search param was not passed return all barometers list
-    if (!typeName || !typeName.trim()) {
-      const barometers = sortBarometers(
-        await Barometer.find().limit(limit).populate(['type', 'condition', 'manufacturer']),
-        sortBy,
-      )
-      return NextResponse.json(barometers, { status: 200 })
-    }
-    // if some non-empty `type` was passed, perform case-insensitive compare with the stored types
-    const barometerType = await BarometerType.findOne({
-      name: { $regex: new RegExp(`^${typeName}$`, 'i') },
-    })
-    if (!barometerType) return NextResponse.json([], { status: 404 })
-
-    // if existing barometer type match the `type` param, return all corresponding barometers
-    const barometers = sortBarometers(
-      await Barometer.find({ type: barometerType._id })
-        .limit(limit)
-        .populate(['type', 'condition', 'manufacturer']),
-      sortBy,
-    )
-    return NextResponse.json(barometers, { status: barometers.length > 0 ? 200 : 404 })
-  } catch (error) {
-    return NextResponse.json(
-      { message: error instanceof Error ? error.message : 'Could not retrieve barometer list' },
-      { status: 500 },
-    )
-  }
-}
-
-/**
- * Add new barometer
- *
- * POST /api/barometers
- */
-export async function POST(req: NextRequest) {
-  try {
-    await connectMongoose()
-    const barometerData: IBarometer = await req.json()
-    const cleanData = cleanObject(barometerData)
-    const slug = slugify(cleanData.name)
-    cleanData.slug = slug
-    const newBarometer = new Barometer(cleanData)
-    await newBarometer.save()
-    revalidatePath('/')
-    return NextResponse.json({ id: newBarometer._id }, { status: 201 })
-  } catch (error) {
-    return NextResponse.json(
-      { message: error instanceof Error ? error.message : 'Error adding new barometer' },
-      { status: 500 },
-    )
-  }
-}
-
-/**
- * Update barometer data
- *
- * PUT /api/barometers
- */
-export async function PUT(req: NextRequest) {
-  try {
-    await connectMongoose()
-    const barometerData: IBarometer = await req.json()
-    const slug = slugify(barometerData.name)
-    barometerData.slug = slug
-    await Manufacturer.findByIdAndUpdate(
-      barometerData.manufacturer?._id,
-      barometerData.manufacturer,
-    )
-    const updatedBarometer = await Barometer.findByIdAndUpdate(barometerData._id, barometerData)
-    if (!updatedBarometer)
-      return NextResponse.json({ message: 'Barometer not found' }, { status: 404 })
-    revalidatePath(`/collection/items/${slug}`)
-    return NextResponse.json({ slug }, { status: 200 })
-  } catch (error) {
-    return NextResponse.json(
-      { message: error instanceof Error ? error.message : 'Error updating barometer' },
-      { status: 500 },
-    )
-  }
-}
diff --git a/app/api/barometers/types/route.ts b/app/api/barometers/types/route.ts
deleted file mode 100644
index a41b6a83..00000000
--- a/app/api/barometers/types/route.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { NextRequest, NextResponse } from 'next/server'
-import { connectMongoose } from '@/utils/mongoose'
-import BarometerType from '@/models/type'
-
-export async function GET(request: NextRequest) {
-  try {
-    await connectMongoose()
-    const { searchParams } = request.nextUrl
-    const type = searchParams.get('type')
-    if (type) {
-      const typeDetails = await BarometerType.findOne({ name: { $regex: type, $options: 'i' } })
-      return NextResponse.json(typeDetails, { status: 201 })
-    }
-    const types = await BarometerType.find().sort({ order: 1 })
-    return NextResponse.json(types, { status: 201 })
-  } catch (error) {
-    return NextResponse.json(
-      { message: error instanceof Error ? error.message : 'Error getting barometer types' },
-      { status: 500 },
-    )
-  }
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export async function PUT(req: NextRequest) {
-  try {
-    await connectMongoose()
-
-    return NextResponse.json({}, { status: 200 })
-  } catch (error) {
-    return NextResponse.json(
-      { message: error instanceof Error ? error.message : 'Error updating barometer' },
-      { status: 500 },
-    )
-  }
-}
diff --git a/app/api/barometers/upload/images/route.ts b/app/api/barometers/upload/images/route.ts
deleted file mode 100644
index 4b226c11..00000000
--- a/app/api/barometers/upload/images/route.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { NextRequest, NextResponse } from 'next/server'
-import path from 'path'
-import { v4 as uuid } from 'uuid'
-import { GetSignedUrlConfig, Storage } from '@google-cloud/storage'
-import { FileDto, UrlDto, UrlProps } from './types'
-
-const decodedPrivateKey = Buffer.from(process.env.GCP_PRIVATE_KEY, 'base64').toString('utf-8')
-const storage = new Storage({
-  projectId: process.env.GCP_PROJECT_ID,
-  credentials: {
-    client_email: process.env.GCP_CLIENT_EMAIL,
-    private_key: decodedPrivateKey,
-  },
-})
-const bucket = storage.bucket(process.env.GCP_BUCKET_NAME)
-
-export async function POST(req: NextRequest) {
-  try {
-    const { files }: FileDto = await req.json()
-    const signedUrls = await Promise.all(
-      files.map<Promise<UrlProps>>(async ({ fileName, contentType }) => {
-        // give unique names to files
-        const extension = path.extname(fileName).toLowerCase()
-        const newFileName = uuid() + extension
-        const options: GetSignedUrlConfig = {
-          version: 'v4',
-          action: 'write',
-          expires: Date.now() + 15 * 60 * 1000, // 15 min
-          contentType,
-        }
-        const cloudFile = bucket.file(newFileName)
-        // generate signed URL for each file
-        const [signedUrl] = await cloudFile.getSignedUrl(options)
-        return {
-          signed: signedUrl,
-          public: cloudFile.publicUrl(),
-        }
-      }),
-    )
-    return NextResponse.json<UrlDto>(
-      {
-        urls: signedUrls,
-      },
-      { status: 201 },
-    )
-  } catch (error) {
-    return NextResponse.json(
-      { message: error instanceof Error ? error.message : 'Error uploading files' },
-      { status: 500 },
-    )
-  }
-}
-
-export async function DELETE(req: NextRequest) {
-  try {
-    const { searchParams } = new URL(req.url)
-    const fileName = searchParams.get('fileName')
-    if (!fileName) return NextResponse.json({ message: 'File name is required' }, { status: 400 })
-
-    // delete file from google cloud storage
-    const file = bucket.file(fileName)
-    await file.delete()
-
-    return NextResponse.json({ message: `${fileName} was deleted` }, { status: 200 })
-  } catch (error) {
-    return NextResponse.json(
-      { message: error instanceof Error ? error.message : 'Error deleting file' },
-      { status: 500 },
-    )
-  }
-}
diff --git a/app/api/barometers/upload/images/types.ts b/app/api/barometers/upload/images/types.ts
deleted file mode 100644
index 46c3109e..00000000
--- a/app/api/barometers/upload/images/types.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export type FileProps = { fileName: string; contentType: string }
-export type FileDto = { files: FileProps[] }
-export type UrlProps = { signed: string; public: string }
-export type UrlDto = { urls: UrlProps[] }
diff --git a/app/collection/items/[slug]/components/edit-fields/condition-edit.tsx b/app/collection/items/[slug]/components/edit-fields/condition-edit.tsx
index 8b8a9188..c6472a1a 100644
--- a/app/collection/items/[slug]/components/edit-fields/condition-edit.tsx
+++ b/app/collection/items/[slug]/components/edit-fields/condition-edit.tsx
@@ -21,7 +21,7 @@ interface TextFieldEditProps extends UnstyledButtonProps {
 }
 
 export function ConditionEdit({ size = 18, barometer, ...props }: TextFieldEditProps) {
-  const { condition } = useBarometers()
+  const { conditions } = useBarometers()
   const { open, close, opened, form, update } = useEditField({ property: 'condition', barometer })
   return (
     <>
@@ -42,13 +42,13 @@ export function ConditionEdit({ size = 18, barometer, ...props }: TextFieldEditP
         <Box component="form" onSubmit={update}>
           <Stack>
             <Select
-              data={condition.data.map(({ name, _id }) => ({
+              data={conditions?.map(({ name, _id }) => ({
                 label: name,
                 value: String(_id),
               }))}
               value={String(form.values.condition?._id)}
               onChange={id => {
-                const newCondition = condition.data.find(({ _id }) => _id === id)
+                const newCondition = conditions?.find(({ _id }) => _id === id)
                 form.setValues({ condition: newCondition })
               }}
               allowDeselect={false}
diff --git a/app/collection/items/[slug]/components/edit-fields/dimensions-edit.tsx b/app/collection/items/[slug]/components/edit-fields/dimensions-edit.tsx
index 2b5ac84a..3221440b 100644
--- a/app/collection/items/[slug]/components/edit-fields/dimensions-edit.tsx
+++ b/app/collection/items/[slug]/components/edit-fields/dimensions-edit.tsx
@@ -6,7 +6,6 @@ import { isEqual } from 'lodash'
 import { useEffect } from 'react'
 import { useForm } from '@mantine/form'
 import { useDisclosure } from '@mantine/hooks'
-import axios, { AxiosError } from 'axios'
 import {
   ActionIcon,
   Box,
@@ -20,8 +19,9 @@ import {
 } from '@mantine/core'
 import { IconEdit, IconTrash, IconSquareRoundedPlus } from '@tabler/icons-react'
 import { IBarometer } from '@/models/barometer'
-import { barometerRoute, barometersApiRoute } from '@/app/constants'
+import { barometerRoute } from '@/app/constants'
 import { showError, showInfo } from '@/utils/notification'
+import { updateBarometer } from '@/actions/barometers'
 
 interface DimFormProps {
   dimensions: IBarometer['dimensions']
@@ -49,7 +49,7 @@ export default function DimensionEdit({ barometer }: DimensionEditProps) {
     if (opened) form.reset()
   }, [opened])
 
-  const updateBarometer = async ({ dimensions }: DimFormProps) => {
+  const update = async ({ dimensions }: DimFormProps) => {
     try {
       if (isEqual(dimensions, barometer.dimensions)) {
         close()
@@ -60,18 +60,12 @@ export default function DimensionEdit({ barometer }: DimensionEditProps) {
         // keep non-empty entries
         dimensions: dimensions?.filter(({ dim }) => dim),
       }
-      const { data } = await axios.put(barometersApiRoute, updatedBarometer)
+      const slug = await updateBarometer(updatedBarometer)
       showInfo(`${barometer.name} updated`, 'Success')
       close()
-      window.location.href = barometerRoute + (data.slug ?? '')
+      window.location.href = barometerRoute + slug
     } catch (error) {
-      if (error instanceof AxiosError) {
-        showError(
-          (error.response?.data as { message: string })?.message ||
-            error.message ||
-            'Error updating barometer',
-        )
-      }
+      showError(error instanceof Error ? error.message : 'Error updating dimensions')
     }
   }
   const addDimension = () => {
@@ -98,7 +92,7 @@ export default function DimensionEdit({ barometer }: DimensionEditProps) {
         tt="capitalize"
         styles={{ title: { fontSize: '1.5rem', fontWeight: 500 } }}
       >
-        <Box component="form" onSubmit={form.onSubmit(updateBarometer)}>
+        <Box component="form" onSubmit={form.onSubmit(update)}>
           <Stack>
             <Stack gap="xs" align="flex-start">
               {form.values.dimensions?.map((_, i) => (
diff --git a/app/collection/items/[slug]/components/edit-fields/images-edit.tsx b/app/collection/items/[slug]/components/edit-fields/images-edit.tsx
index 464b3759..48e0ba2b 100644
--- a/app/collection/items/[slug]/components/edit-fields/images-edit.tsx
+++ b/app/collection/items/[slug]/components/edit-fields/images-edit.tsx
@@ -25,17 +25,12 @@ import {
 } from '@dnd-kit/sortable'
 import { useEffect, useState } from 'react'
 import { useDisclosure } from '@mantine/hooks'
-import axios, { AxiosError } from 'axios'
 import { IBarometer } from '@/models/barometer'
 import sx from './styles.module.scss'
-import {
-  barometerRoute,
-  barometersApiRoute,
-  googleStorageImagesFolder,
-  imageUploadApiRoute,
-} from '@/app/constants'
-import { FileDto, UrlDto } from '@/app/api/barometers/upload/images/types'
+import { barometerRoute, googleStorageImagesFolder } from '@/app/constants'
 import { showError, showInfo } from '@/utils/notification'
+import { updateBarometer } from '@/actions/barometers'
+import { deleteImage, uploadImages } from '@/actions/images'
 
 interface ImagesEditProps extends UnstyledButtonProps {
   size?: string | number | undefined
@@ -45,15 +40,6 @@ interface FormProps {
   images: string[]
 }
 
-async function deleteFromStorage(img: string) {
-  // delete image file from google storage
-  await axios.delete(imageUploadApiRoute, {
-    params: {
-      fileName: img,
-    },
-  })
-}
-
 function SortableImage({
   image,
   handleDelete,
@@ -133,25 +119,18 @@ export function ImagesEdit({ barometer, size, ...props }: ImagesEditProps) {
     }
     setIsUploading(true)
     try {
-      // erase deleted images
       const extraFiles = barometer.images?.filter(img => !form.values.images.includes(img))
-      if (extraFiles) await Promise.all(extraFiles?.map(deleteFromStorage))
+      if (extraFiles) await Promise.all(extraFiles?.map(deleteImage))
       const updatedBarometer: IBarometer = {
         ...barometer,
         images: form.getValues().images,
       }
-      const { data } = await axios.put(barometersApiRoute, updatedBarometer)
+      const slug = await updateBarometer(updatedBarometer)
       showInfo(`${barometer.name} updated`, 'Success')
       close()
-      window.location.href = barometerRoute + (data.slug ?? '')
+      window.location.href = barometerRoute + slug
     } catch (error) {
-      if (error instanceof AxiosError) {
-        showError(
-          (error.response?.data as { message: string })?.message ||
-            error.message ||
-            'Error updating barometer',
-        )
-      }
+      showError(error instanceof Error ? error.message : 'Error uploading images')
     } finally {
       setIsUploading(false)
     }
@@ -159,66 +138,35 @@ export function ImagesEdit({ barometer, size, ...props }: ImagesEditProps) {
   /**
    * Upload images to google storage
    */
-  const uploadImages = async (files: File[]) => {
+  const googleUploadImages = async (files: File[]) => {
     if (!files || !Array.isArray(files) || files.length === 0) return
     setIsUploading(true)
-    try {
-      const {
-        data: { urls },
-      } = await axios.post<UrlDto>(
-        imageUploadApiRoute,
-        {
-          files: files.map(file => ({
-            fileName: file.name,
-            contentType: file.type,
-          })),
-        } as FileDto,
-        { headers: { 'Content-Type': 'application/json' } },
-      )
-      // upload all files concurrently
-      await Promise.all(
-        urls.map(async ({ signed }, index) => {
-          const file = files[index]
-          await axios.put(signed, file, {
-            headers: {
-              'Content-Type': file.type,
-            },
-          })
-        }),
-      )
-      // extracting file names from URLs
-      const newImages = urls
-        .map(url => new URL(url.public).pathname.split('/').at(-1) ?? '')
-        .filter(url => Boolean(url))
-      form.setFieldValue('images', prev => [...prev, ...newImages])
-    } catch (error) {
-      const defaultErrMsg = 'Error uploading files'
-      if (error instanceof AxiosError) {
-        showError((error.response?.data as { message?: string })?.message || defaultErrMsg)
-        return
-      }
-      showError(error instanceof Error ? error.message : defaultErrMsg)
-    } finally {
-      setIsUploading(false)
-    }
+    const urls = await uploadImages(
+      files.map(({ name, type }) => ({
+        fileName: name,
+        contentType: type,
+      })),
+    )
+    // upload all files to Google cloud concurrently
+    await Promise.all(
+      urls.map(async ({ signed }, i) => {
+        const file = files[i]
+        await fetch(signed, { method: 'PUT', body: file, headers: { 'Content-Type': file.type } })
+      }),
+    )
+    // extracting file names from URLs
+    const newImages = urls
+      .map(url => new URL(url.public).pathname.split('/').at(-1) ?? '')
+      .filter(url => Boolean(url))
+    form.setFieldValue('images', prev => [...prev, ...newImages])
+    setIsUploading(false)
   }
 
   const handleDeleteFile = async (img: string) => {
     setIsUploading(true)
-    try {
-      // if the image file was uploaded but not yet added to the barometer
-      if (!barometer.images?.includes(img)) await deleteFromStorage(img)
-      form.setFieldValue('images', old => old.filter(file => !file.includes(img)))
-    } catch (error) {
-      const defaultErrMsg = 'Error deleting file'
-      if (error instanceof AxiosError) {
-        showError((error.response?.data as { message?: string })?.message || defaultErrMsg)
-        return
-      }
-      showError(error instanceof Error ? error.message : defaultErrMsg)
-    } finally {
-      setIsUploading(false)
-    }
+    if (!barometer.images?.includes(img)) await deleteImage(img)
+    form.setFieldValue('images', old => old.filter(file => !file.includes(img)))
+    setIsUploading(false)
   }
 
   const onClose = async () => {
@@ -226,7 +174,7 @@ export function ImagesEdit({ barometer, size, ...props }: ImagesEditProps) {
     try {
       setIsUploading(true)
       const extraImages = form.values.images.filter(img => !barometer.images?.includes(img))
-      await Promise.all(extraImages.map(deleteFromStorage))
+      await Promise.all(extraImages.map(deleteImage))
     } catch (error) {
       // do nothing
     } finally {
@@ -247,7 +195,7 @@ export function ImagesEdit({ barometer, size, ...props }: ImagesEditProps) {
         <Box pos="relative" component="form" onSubmit={form.onSubmit(editImages)}>
           <LoadingOverlay visible={isUploading} zIndex={100} />
           <Stack>
-            <FileButton multiple onChange={uploadImages} accept="image/**">
+            <FileButton multiple onChange={googleUploadImages} accept="image/**">
               {fbProps => (
                 <Button
                   color="dark.4"
diff --git a/app/collection/items/[slug]/components/edit-fields/manufacturer-edit.tsx b/app/collection/items/[slug]/components/edit-fields/manufacturer-edit.tsx
index 22aac0f7..3b9cce94 100644
--- a/app/collection/items/[slug]/components/edit-fields/manufacturer-edit.tsx
+++ b/app/collection/items/[slug]/components/edit-fields/manufacturer-edit.tsx
@@ -15,7 +15,6 @@ import {
   Select,
   Group,
 } from '@mantine/core'
-import axios, { AxiosError } from 'axios'
 import { useDisclosure } from '@mantine/hooks'
 import { isLength } from 'validator'
 import { IconEdit, IconTrash } from '@tabler/icons-react'
@@ -23,8 +22,10 @@ import { useForm } from '@mantine/form'
 import { IBarometer } from '@/models/barometer'
 import { IManufacturer } from '@/models/manufacturer'
 import { showError, showInfo } from '@/utils/notification'
-import { barometerRoute, barometersApiRoute } from '@/app/constants'
+import { barometerRoute } from '@/app/constants'
 import { useBarometers } from '@/app/hooks/useBarometers'
+import { deleteManufacturer } from '@/actions/manufacturers'
+import { updateBarometer } from '@/actions/barometers'
 
 interface ManufacturerEditProps extends UnstyledButtonProps {
   size?: string | number | undefined
@@ -57,11 +58,11 @@ export function ManufacturerEdit({ size = 18, barometer, ...props }: Manufacture
 
   // Reset selected manufacturer index
   const resetManufacturerIndex = useCallback(() => {
-    const manufacturerIndex = manufacturers.data.findIndex(
+    const manufacturerIndex = manufacturers?.findIndex(
       ({ _id }) => _id === barometer.manufacturer?._id,
     )
-    setSelectedManufacturerIndex(manufacturerIndex)
-  }, [barometer.manufacturer?._id, manufacturers.data])
+    setSelectedManufacturerIndex(manufacturerIndex ?? 0)
+  }, [barometer.manufacturer?._id, manufacturers])
 
   // Reset selected manufacturer index when modal is opened
   useEffect(() => {
@@ -71,7 +72,7 @@ export function ManufacturerEdit({ size = 18, barometer, ...props }: Manufacture
 
   // Set form values when selected manufacturer index changes
   useEffect(() => {
-    const selectedManufacturer = manufacturers?.data[selectedManufacturerIndex]
+    const selectedManufacturer = manufacturers?.[selectedManufacturerIndex]
     // pick all manufacturer fields and put empty string if not present
     const manufacturerFormData: IManufacturer = {
       _id: selectedManufacturer?._id ?? '',
@@ -87,7 +88,7 @@ export function ManufacturerEdit({ size = 18, barometer, ...props }: Manufacture
 
   const update = async (manufacturer: IManufacturer) => {
     try {
-      const selectedManufacturer = manufacturers.data[selectedManufacturerIndex]
+      const selectedManufacturer = manufacturers?.[selectedManufacturerIndex]
       const updatedBarometer = {
         ...barometer,
         manufacturer: {
@@ -95,18 +96,12 @@ export function ManufacturerEdit({ size = 18, barometer, ...props }: Manufacture
           ...manufacturer,
         },
       }
-      const { data } = await axios.put(barometersApiRoute, updatedBarometer)
+      const slug = await updateBarometer(updatedBarometer)
       showInfo(`${manufacturer.name} updated`, 'Success')
       close()
-      window.location.href = barometerRoute + (data.slug ?? '')
+      window.location.href = barometerRoute + slug
     } catch (error) {
-      if (error instanceof AxiosError) {
-        showError(
-          (error.response?.data as { message: string })?.message ||
-            error.message ||
-            'Error updating barometer',
-        )
-      }
+      showError(error instanceof Error ? error.message : 'Error updating manufacturer')
     }
   }
 
@@ -120,9 +115,7 @@ export function ManufacturerEdit({ size = 18, barometer, ...props }: Manufacture
               <ActionIcon
                 variant="outline"
                 color="dark"
-                onClick={() =>
-                  manufacturers.delete(manufacturers.data[selectedManufacturerIndex]._id!)
-                }
+                onClick={() => deleteManufacturer(manufacturers?.[selectedManufacturerIndex]._id!)}
               >
                 <IconTrash />
               </ActionIcon>
@@ -130,7 +123,7 @@ export function ManufacturerEdit({ size = 18, barometer, ...props }: Manufacture
           </Group>
           <Select
             value={String(selectedManufacturerIndex)}
-            data={manufacturers.data.map(({ name }, i) => ({
+            data={manufacturers?.map(({ name }, i) => ({
               value: String(i),
               label: name,
             }))}
diff --git a/app/collection/items/[slug]/components/edit-fields/useEditField.ts b/app/collection/items/[slug]/components/edit-fields/useEditField.ts
index f3c7de08..778acea6 100644
--- a/app/collection/items/[slug]/components/edit-fields/useEditField.ts
+++ b/app/collection/items/[slug]/components/edit-fields/useEditField.ts
@@ -3,10 +3,10 @@ import { isEqual } from 'lodash'
 import { useCallback, useEffect, useMemo } from 'react'
 import { useDisclosure } from '@mantine/hooks'
 import { useForm } from '@mantine/form'
-import axios, { AxiosError } from 'axios'
 import { IBarometer } from '@/models/barometer'
-import { barometersApiRoute, barometerRoute } from '@/app/constants'
+import { barometerRoute } from '@/app/constants'
 import { showError, showInfo } from '@/utils/notification'
+import { updateBarometer } from '@/actions/barometers'
 
 interface Props {
   barometer: IBarometer
@@ -31,18 +31,12 @@ export function useEditField({ property, barometer, validate }: Props) {
         return
       }
       const updatedBarometer = { ...barometer, [property]: newValue }
-      const { data } = await axios.put(barometersApiRoute, updatedBarometer)
+      const slug = await updateBarometer(updatedBarometer)
       showInfo(`${barometer.name} updated`, 'Success')
       close()
-      window.location.href = barometerRoute + (data.slug ?? '')
+      window.location.href = barometerRoute + slug
     } catch (error) {
-      if (error instanceof AxiosError) {
-        showError(
-          (error.response?.data as { message: string })?.message ||
-            error.message ||
-            'Error updating barometer',
-        )
-      }
+      showError(error instanceof Error ? error.message : `Error updating ${barometer.name}`)
     }
   }, [barometer, close, form.values, property])
 
diff --git a/app/collection/items/[slug]/page.tsx b/app/collection/items/[slug]/page.tsx
index 42aecdfe..d56f2646 100644
--- a/app/collection/items/[slug]/page.tsx
+++ b/app/collection/items/[slug]/page.tsx
@@ -15,7 +15,7 @@ import { ConditionEdit } from './components/edit-fields/condition-edit'
 import { ManufacturerEdit } from './components/edit-fields/manufacturer-edit'
 import { BreadcrumbsComponent } from './components/breadcrumbs'
 import sx from './styles.module.scss'
-import { fetchBarometers } from '@/utils/fetch'
+import { getBarometer, listBarometers } from '@/actions/barometers'
 import DimensionEdit from './components/edit-fields/dimensions-edit'
 import { slug as slugify } from '@/utils/misc'
 import { DescriptionText } from '@/app/components/description-text'
@@ -31,7 +31,7 @@ interface BarometerItemProps {
 export async function generateMetadata({
   params: { slug },
 }: BarometerItemProps): Promise<Metadata> {
-  const { description, name, images } = await fetchBarometers(slug)
+  const { description, name, images } = await getBarometer(slug)
   const barometerTitle = `${title}: ${capitalize(name)}`
   const barometerImages =
     images &&
@@ -67,7 +67,7 @@ export async function generateMetadata({
  * to be used as static parameters for Next.js static generation.
  */
 export async function generateStaticParams(): Promise<Slug[]> {
-  const barometers = await fetchBarometers()
+  const barometers = await listBarometers()
   return barometers.map(({ slug, name }) => ({
     slug: slug ?? slugify(name),
   }))
@@ -86,7 +86,7 @@ async function isAuthorized(): Promise<boolean> {
 export default async function BarometerItem({ params: { slug } }: BarometerItemProps) {
   try {
     const isAdmin = await isAuthorized()
-    const barometer: IBarometer = await fetchBarometers(slug)
+    const barometer: IBarometer = await getBarometer(slug)
     const { name, images, description, manufacturer, dating, dimensions, condition, collectionId } =
       barometer
 
diff --git a/app/collection/types/[type]/components/barometer-card/barometer-card.tsx b/app/collection/types/[type]/components/barometer-card/barometer-card.tsx
index ab1a1552..fb3e4f36 100644
--- a/app/collection/types/[type]/components/barometer-card/barometer-card.tsx
+++ b/app/collection/types/[type]/components/barometer-card/barometer-card.tsx
@@ -8,15 +8,23 @@ interface BarometerCardProps {
   name: string
   link: string
   manufacturer?: string
+  priority: boolean
 }
 
-export async function BarometerCard({ name, image, link, manufacturer }: BarometerCardProps) {
+export async function BarometerCard({
+  name,
+  image,
+  link,
+  manufacturer,
+  priority,
+}: BarometerCardProps) {
   return (
     <Box>
       <Anchor c="dark" component={Link} href={link}>
         <Box className={styles.bg_gradient}>
           <NextImage
-            priority
+            priority={priority}
+            loading={priority ? 'eager' : 'lazy'}
             quality={50}
             src={image}
             alt={name}
diff --git a/app/collection/types/[type]/page.tsx b/app/collection/types/[type]/page.tsx
index 690fb03c..ad362e3e 100644
--- a/app/collection/types/[type]/page.tsx
+++ b/app/collection/types/[type]/page.tsx
@@ -6,8 +6,9 @@ import { BarometerCard } from './components/barometer-card'
 import { slug } from '@/utils/misc'
 import { SortValue } from './types'
 import Sort from './sort'
-import { fetchBarometers, fetchTypes } from '@/utils/fetch'
 import { DescriptionText } from '@/app/components/description-text'
+import { getType, listTypes } from '@/actions/barometer-types'
+import { listBarometers } from '@/actions/barometers'
 import { title, openGraph, twitter } from '@/app/metadata'
 
 interface CollectionProps {
@@ -20,8 +21,8 @@ interface CollectionProps {
 }
 
 export async function generateMetadata({ params: { type } }: CollectionProps): Promise<Metadata> {
-  const { description } = await fetchTypes({ type })
-  const barometersOfType = await fetchBarometers({ type, limit: '5' })
+  const { description } = await getType(type)
+  const barometersOfType = await listBarometers({ type, limit: 5 })
   const collectionTitle = `${title}: ${capitalize(type)} Barometers Collection`
   const barometerImages = barometersOfType
     .filter(({ images }) => images && images.length > 0)
@@ -50,10 +51,10 @@ export async function generateMetadata({ params: { type } }: CollectionProps): P
 }
 
 export default async function Collection({ params: { type }, searchParams }: CollectionProps) {
-  const sortBy = searchParams.sort ?? 'date'
-  const barometersOfType = await fetchBarometers({ type, sort: sortBy })
+  const sort = searchParams.sort ?? 'date'
+  const barometersOfType = await listBarometers({ type, sort })
   // selected barometer type details
-  const { description } = await fetchTypes({ type })
+  const { description } = await getType(type)
   return (
     <Container py="xl" size="xl">
       <Stack gap="xs">
@@ -61,11 +62,12 @@ export default async function Collection({ params: { type }, searchParams }: Col
           {type}
         </Title>
         {description && <DescriptionText size="sm" description={description} />}
-        <Sort sortBy={sortBy} style={{ alignSelf: 'flex-end' }} />
+        <Sort sortBy={sort} style={{ alignSelf: 'flex-end' }} />
         <Grid justify="center" gutter="xl">
-          {barometersOfType.map(({ name, _id, images, manufacturer }) => (
+          {barometersOfType.map(({ name, _id, images, manufacturer }, i) => (
             <GridCol span={{ base: 6, xs: 3, lg: 3 }} key={String(_id)}>
               <BarometerCard
+                priority={i < 8}
                 image={googleStorageImagesFolder + images![0]}
                 name={name}
                 link={barometerRoute + slug(name)}
@@ -80,7 +82,7 @@ export default async function Collection({ params: { type }, searchParams }: Col
 }
 
 export async function generateStaticParams() {
-  const barometerTypes = await fetchTypes()
+  const barometerTypes = await listTypes()
   return barometerTypes.map(({ name }) => ({
     type: name.toLowerCase(),
   }))
diff --git a/app/components/category-card/category-card.tsx b/app/components/category-card/category-card.tsx
index 662be5cb..8b3cbedb 100644
--- a/app/components/category-card/category-card.tsx
+++ b/app/components/category-card/category-card.tsx
@@ -8,9 +8,10 @@ interface CategoryCardProps {
   name: string
   link: string
   image?: string
+  priority: boolean
 }
 
-export const CategoryCard: FC<CategoryCardProps> = ({ name, link, image }) => {
+export const CategoryCard: FC<CategoryCardProps> = ({ name, link, image, priority }) => {
   return (
     <Anchor component={NextLink} href={link}>
       <AspectRatio ratio={1}>
@@ -18,7 +19,8 @@ export const CategoryCard: FC<CategoryCardProps> = ({ name, link, image }) => {
           {image && (
             <NextImage
               fill
-              priority
+              priority={priority}
+              loading={priority ? 'eager' : 'lazy'}
               quality={50}
               sizes="(max-width: 768px) 100vw, (max-width: 1200px) 50vw, 33vw"
               src={image}
diff --git a/app/components/header/mobile-menu/mobile-menu.tsx b/app/components/header/mobile-menu/mobile-menu.tsx
index b39b76c0..0c7793e8 100644
--- a/app/components/header/mobile-menu/mobile-menu.tsx
+++ b/app/components/header/mobile-menu/mobile-menu.tsx
@@ -80,8 +80,8 @@ export const MobileMenu: FC<DrawerProps> = props => {
                       </List.Item>
                       <Collapse transitionDuration={500} in={opened[i]}>
                         <List px="xl" listStyleType="none">
-                          {types.data.map(({ name, label, _id }) => (
-                            <List.Item pb="sm" key={String(_id)}>
+                          {types?.map(({ name, label }, j) => (
+                            <List.Item pb="sm" key={String(j)}>
                               <Anchor
                                 c="inherit"
                                 component={Link}
diff --git a/app/components/header/tabs/tabs.tsx b/app/components/header/tabs/tabs.tsx
index 4d24e6af..aab65158 100644
--- a/app/components/header/tabs/tabs.tsx
+++ b/app/components/header/tabs/tabs.tsx
@@ -9,8 +9,8 @@ import Link from 'next/link'
 import { useSession } from 'next-auth/react'
 import sx from './tabs.module.scss'
 import { menuData } from '../menudata'
-import { useBarometers } from '@/app/hooks/useBarometers'
 import { barometerTypesRoute } from '@/app/constants'
+import { useBarometers } from '@/app/hooks/useBarometers'
 
 const WideScreenTabs = ({ className, ...props }: CenterProps) => {
   const { types } = useBarometers()
@@ -76,9 +76,9 @@ const WideScreenTabs = ({ className, ...props }: CenterProps) => {
                 >
                   <Menu.Target>{renderTab()}</Menu.Target>
                   <Menu.Dropdown>
-                    {types.data.map(({ label, _id, name }) => (
+                    {types?.map(({ label, name }, j) => (
                       <Anchor
-                        key={String(_id)}
+                        key={String(j)}
                         href={barometerTypesRoute + name.toLocaleLowerCase()}
                         component={Link}
                         c="inherit"
diff --git a/app/hooks/useBarometers.ts b/app/hooks/useBarometers.ts
index 06efbc48..5c94d15a 100644
--- a/app/hooks/useBarometers.ts
+++ b/app/hooks/useBarometers.ts
@@ -1,87 +1,20 @@
-import { useMemo, useEffect } from 'react'
-import axios, { AxiosError } from 'axios'
-import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
-import { IBarometerCondition } from '@/models/condition'
-import { IBarometerType } from '@/models/type'
-import { IManufacturer } from '@/models/manufacturer'
-import { showError, showInfo } from '@/utils/notification'
-import { conditionsApiRoute, barometerTypesApiRoute, manufacturersApiRoute } from '@/app/constants'
+import { useMemo } from 'react'
+import useSWR from 'swr'
+import { listTypes } from '@/actions/barometer-types'
+import { listManufacturers } from '@/actions/manufacturers'
+import { listConditions } from '@/actions/conditions'
 
-export const useBarometers = () => {
-  const queryClient = useQueryClient()
-  const {
-    data: condition,
-    error: conditionError,
-    isLoading: conditionIsLoading,
-  } = useQuery<IBarometerCondition[]>({
-    queryKey: ['conditions'],
-    queryFn: () => axios.get(conditionsApiRoute).then(({ data }) => data),
-  })
-  const {
-    data: types,
-    error: typesError,
-    isLoading: typesIsLoading,
-  } = useQuery<IBarometerType[]>({
-    queryKey: ['types'],
-    queryFn: () => axios.get(barometerTypesApiRoute).then(({ data }) => data),
-  })
-  const {
-    data: manufacturers,
-    error: manufacturersError,
-    isLoading: manufacturersIsLoading,
-  } = useQuery<IManufacturer[]>({
-    queryKey: ['manufacturers'],
-    queryFn: () => axios.get(manufacturersApiRoute).then(({ data }) => data),
-  })
-
-  const { mutate: deleteManufacturer } = useMutation({
-    mutationFn: (id: string) =>
-      axios.delete(`${manufacturersApiRoute}/${id}`).then(({ data }) => data),
-    onSuccess: () => {
-      queryClient.invalidateQueries({
-        queryKey: ['manufacturers'],
-      })
-      showInfo('Manufacturer deleted', 'Success')
-    },
-    onError: (error: AxiosError) => {
-      showError(
-        (error.response?.data as { message: string })?.message ||
-          error.message ||
-          'Error deleting manufacturer',
-      )
-    },
-  })
-
-  useEffect(() => {
-    ;[typesError, conditionError, manufacturersError].forEach(err => {
-      if (err instanceof Error) showError(err.message)
-    })
-  }, [typesError, conditionError, manufacturersError])
+export function useBarometers() {
+  const { data: types } = useSWR('types', listTypes)
+  const { data: manufacturers } = useSWR('manufacturers', listManufacturers)
+  const { data: conditions } = useSWR('conditions', listConditions)
 
   return useMemo(
     () => ({
-      condition: {
-        data: condition ?? [],
-        isLoading: conditionIsLoading,
-      },
-      types: {
-        data: types ?? [],
-        isLoading: typesIsLoading,
-      },
-      manufacturers: {
-        data: manufacturers ?? [],
-        isLoading: manufacturersIsLoading,
-        delete: deleteManufacturer,
-      },
-    }),
-    [
-      condition,
-      conditionIsLoading,
+      conditions,
       types,
-      typesIsLoading,
       manufacturers,
-      manufacturersIsLoading,
-      deleteManufacturer,
-    ],
+    }),
+    [manufacturers, types, conditions],
   )
 }
diff --git a/app/page.tsx b/app/page.tsx
index 1856d245..a9218528 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -1,48 +1,28 @@
 import { Container, Grid, GridCol } from '@mantine/core'
 import { HeadingImage } from './components/heading-image'
 import { CategoryCard } from './components/category-card'
-import { barometerTypesApiRoute, barometerTypesRoute } from './constants'
+import { barometerTypesRoute } from './constants'
 import { IBarometerType } from '@/models/type'
-import { ShowError } from './components/show-error'
+import { listTypes } from '@/actions/barometer-types'
 
 export default async function HomePage() {
-  let barometerTypes: IBarometerType[] = []
-  let errorMessage = ''
-  try {
-    const baseUrl = process.env.NEXT_PUBLIC_BASE_URL
-    if (!baseUrl) throw new Error('Base URL is not set. Please configure NEXT_PUBLIC_BASE_URL.')
-    const res = await fetch(baseUrl + barometerTypesApiRoute, {
-      cache: 'force-cache',
-    })
-    if (!res.ok) throw new Error(res.statusText)
-    barometerTypes = await res.json()
-  } catch (error) {
-    console.error('Error fetching barometer types:', error)
-    errorMessage =
-      error instanceof Error
-        ? error.message
-        : 'Unable to load barometer types. Please try again later.'
-  }
-
+  const barometerTypes: IBarometerType[] = await listTypes()
   return (
     <>
       <HeadingImage />
       <Container size="xl" pb="2.3rem">
-        {errorMessage ? (
-          <ShowError message={errorMessage} />
-        ) : (
-          <Grid justify="center" gutter={{ base: '2rem', sm: '2.5rem' }}>
-            {barometerTypes.map(({ _id, label, name, image }) => (
-              <GridCol key={String(_id)} span={{ base: 12, xs: 6, lg: 4 }}>
-                <CategoryCard
-                  image={image}
-                  name={label}
-                  link={barometerTypesRoute + name.toLowerCase()}
-                />
-              </GridCol>
-            ))}
-          </Grid>
-        )}
+        <Grid justify="center" gutter={{ base: '2rem', sm: '2.5rem' }}>
+          {barometerTypes.map(({ image, label, name }, i) => (
+            <GridCol key={String(i)} span={{ base: 12, xs: 6, lg: 4 }}>
+              <CategoryCard
+                priority={i < 3}
+                image={image}
+                name={label}
+                link={barometerTypesRoute + name.toLowerCase()}
+              />
+            </GridCol>
+          ))}
+        </Grid>
       </Container>
     </>
   )
diff --git a/app/providers.tsx b/app/providers.tsx
index acd2421a..f68f3065 100644
--- a/app/providers.tsx
+++ b/app/providers.tsx
@@ -4,17 +4,12 @@ import '@mantine/core/styles.css'
 import { PropsWithChildren } from 'react'
 import { MantineProvider } from '@mantine/core'
 import { SessionProvider } from 'next-auth/react'
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { theme } from '../theme'
 
-const queryClient = new QueryClient()
-
 export default function Providers({ children }: PropsWithChildren) {
   return (
     <MantineProvider defaultColorScheme="light" theme={theme}>
-      <SessionProvider>
-        <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
-      </SessionProvider>
+      <SessionProvider>{children}</SessionProvider>
     </MantineProvider>
   )
 }
diff --git a/models/barometer.ts b/models/barometer.ts
index 75c2837c..a0f24630 100644
--- a/models/barometer.ts
+++ b/models/barometer.ts
@@ -4,7 +4,7 @@ import { IBarometerType } from './type'
 import { IBarometerCondition } from './condition'
 
 export interface IBarometer {
-  _id?: string
+  _id: string
   collectionId: string
   name: string
   slug?: string
diff --git a/models/condition.ts b/models/condition.ts
index e34f2626..fcd00fc7 100644
--- a/models/condition.ts
+++ b/models/condition.ts
@@ -1,6 +1,7 @@
-import { Schema, model, Document, models, type Model } from 'mongoose'
+import { Schema, model, models, type Model } from 'mongoose'
 
-export interface IBarometerCondition extends Document {
+export interface IBarometerCondition {
+  _id: string
   name: string
   value: number
   description: string
diff --git a/models/user.ts b/models/user.ts
index 20704ac1..d551bce0 100644
--- a/models/user.ts
+++ b/models/user.ts
@@ -8,7 +8,7 @@ export enum AccessRole {
 }
 
 export interface IUser {
-  _id?: string
+  _id: string
   email: string
   password?: string
   name: string
diff --git a/package-lock.json b/package-lock.json
index 757725d4..417f5043 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,8 +19,6 @@
         "@next/bundle-analyzer": "^14.2.4",
         "@next/third-parties": "^15.0.3",
         "@tabler/icons-react": "^3.6.0",
-        "@tanstack/react-query": "^5.56.2",
-        "axios": "^1.7.7",
         "bcrypt": "^5.1.1",
         "clsx": "^2.1.1",
         "dayjs": "^1.11.13",
@@ -41,6 +39,7 @@
         "sharp": "^0.33.5",
         "slugify": "^1.6.6",
         "swiper": "^11.1.14",
+        "swr": "^2.2.5",
         "traverse": "^0.6.10",
         "uuid": "^10.0.0",
         "validator": "^13.12.0"
@@ -5620,32 +5619,6 @@
         "eslint": "^8.57.0 || ^9.0.0"
       }
     },
-    "node_modules/@tanstack/query-core": {
-      "version": "5.59.16",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.59.16.tgz",
-      "integrity": "sha512-crHn+G3ltqb5JG0oUv6q+PMz1m1YkjpASrXTU+sYWW9pLk0t2GybUHNRqYPZWhxgjPaVGC4yp92gSFEJgYEsPw==",
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/tannerlinsley"
-      }
-    },
-    "node_modules/@tanstack/react-query": {
-      "version": "5.59.16",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.59.16.tgz",
-      "integrity": "sha512-MuyWheG47h6ERd4PKQ6V8gDyBu3ThNG22e1fRVwvq6ap3EqsFhyuxCAwhNP/03m/mLg+DAb0upgbPaX6VB+CkQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@tanstack/query-core": "5.59.16"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/tannerlinsley"
-      },
-      "peerDependencies": {
-        "react": "^18 || ^19"
-      }
-    },
     "node_modules/@testing-library/dom": {
       "version": "10.4.0",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",
@@ -7520,17 +7493,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/axios": {
-      "version": "1.7.7",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
-      "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
-      "license": "MIT",
-      "dependencies": {
-        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.0",
-        "proxy-from-env": "^1.1.0"
-      }
-    },
     "node_modules/axobject-query": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
@@ -11389,26 +11351,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/follow-redirects": {
-      "version": "1.15.9",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
-      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/for-each": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
@@ -11539,6 +11481,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
       "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
@@ -17058,12 +17001,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "license": "MIT"
-    },
     "node_modules/psl": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
@@ -19471,6 +19408,19 @@
         "node": ">= 4.7.0"
       }
     },
+    "node_modules/swr": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/swr/-/swr-2.2.5.tgz",
+      "integrity": "sha512-QtxqyclFeAsxEUeZIYmsaQ0UjimSq1RZ9Un7I68/0ClKK/U3LoyQunwkQfJZr2fc22DfIXLNDc2wFyTEikCUpg==",
+      "license": "MIT",
+      "dependencies": {
+        "client-only": "^0.0.1",
+        "use-sync-external-store": "^1.2.0"
+      },
+      "peerDependencies": {
+        "react": "^16.11.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/symbol-tree": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
@@ -20649,6 +20599,15 @@
         }
       }
     },
+    "node_modules/use-sync-external-store": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz",
+      "integrity": "sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/util": {
       "version": "0.12.5",
       "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
diff --git a/package.json b/package.json
index 27b427c5..8561f1df 100644
--- a/package.json
+++ b/package.json
@@ -34,8 +34,6 @@
     "@next/bundle-analyzer": "^14.2.4",
     "@next/third-parties": "^15.0.3",
     "@tabler/icons-react": "^3.6.0",
-    "@tanstack/react-query": "^5.56.2",
-    "axios": "^1.7.7",
     "bcrypt": "^5.1.1",
     "clsx": "^2.1.1",
     "dayjs": "^1.11.13",
@@ -56,6 +54,7 @@
     "sharp": "^0.33.5",
     "slugify": "^1.6.6",
     "swiper": "^11.1.14",
+    "swr": "^2.2.5",
     "traverse": "^0.6.10",
     "uuid": "^10.0.0",
     "validator": "^13.12.0"
diff --git a/utils/fetch.ts b/utils/fetch.ts
deleted file mode 100644
index 0625f010..00000000
--- a/utils/fetch.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { barometersApiRoute, barometerTypesApiRoute } from '@/app/constants'
-import { IBarometer } from '@/models/barometer'
-import { IBarometerType } from '@/models/type'
-
-/**
- * Returns a specific barometer details
- * @param slug - slug
- */
-export function fetchBarometers(slug: string): Promise<IBarometer>
-/**
- * Returns a full list of barometers in the collection
- */
-export function fetchBarometers(): Promise<IBarometer[]>
-/**
- * Returns a list of barometers filtered by the query string (type, sort)
- * @param qs - query string parameters
- */
-export function fetchBarometers(qs: Record<string, string>): Promise<IBarometer[]>
-export async function fetchBarometers(
-  slugOrQs?: string | Record<string, string>,
-): Promise<IBarometer | IBarometer[]> {
-  const input =
-    process.env.NEXT_PUBLIC_BASE_URL +
-    barometersApiRoute +
-    (typeof slugOrQs === 'string' ? slugOrQs : slugOrQs ? `?${new URLSearchParams(slugOrQs)}` : '')
-
-  const res = await fetch(input, {
-    next: {
-      revalidate: 600,
-    },
-  })
-  if (!res.ok) throw new Error(res.statusText)
-  return res.json()
-}
-
-export function fetchTypes(): Promise<IBarometerType[]>
-export function fetchTypes(qs: Record<string, string>): Promise<IBarometerType>
-export async function fetchTypes(
-  qs?: Record<string, string>,
-): Promise<IBarometerType[] | IBarometerType> {
-  const res = await fetch(
-    process.env.NEXT_PUBLIC_BASE_URL +
-      barometerTypesApiRoute +
-      (qs ? `?${new URLSearchParams(qs)}` : ''),
-  )
-  return res.json()
-}