diff --git a/backend/api/views/docker_view.py b/backend/api/views/docker_view.py
index 769de796..fb1b0346 100644
--- a/backend/api/views/docker_view.py
+++ b/backend/api/views/docker_view.py
@@ -1,23 +1,66 @@
 from api.models.docker import DockerImage
 from api.permissions.docker_permissions import DockerPermission
-from api.permissions.role_permissions import IsAssistant, IsTeacher
 from api.serializers.docker_serializer import DockerImageSerializer
+from rest_framework.permissions import IsAdminUser
 from django.db.models import Q
 from django.db.models.manager import BaseManager
 from rest_framework.decorators import action
 from rest_framework.mixins import (CreateModelMixin, DestroyModelMixin,
                                    RetrieveModelMixin, UpdateModelMixin)
-from rest_framework.permissions import IsAdminUser
 from rest_framework.request import Request
 from rest_framework.response import Response
 from rest_framework.viewsets import GenericViewSet
 
+from api.views.pagination.basic_pagination import BasicPagination
+
 
 class DockerImageViewSet(RetrieveModelMixin, CreateModelMixin, UpdateModelMixin, DestroyModelMixin, GenericViewSet):
 
     queryset = DockerImage.objects.all()
     serializer_class = DockerImageSerializer
-    permission_classes = [DockerPermission]
+    permission_classes = [DockerPermission, IsAdminUser]
+
+    @action(detail=False)
+    def search(self, request: Request) -> Response:
+        self.pagination_class = BasicPagination
+
+        search = request.query_params.get("search", "")
+        identifier = request.query_params.get("id", "")
+        name = request.query_params.get("name", "")
+        owner = request.query_params.get("owner", "")
+
+        queryset1 = self.get_queryset().filter(
+            id__icontains=search
+        )
+        queryset2 = self.get_queryset().filter(
+            name__icontains=search
+        )
+        queryset3 = self.get_queryset().filter(
+            owner__id__icontains=search
+        )
+        queryset1 = queryset1.union(queryset2, queryset3)
+        queryset = self.get_queryset().filter(
+            id__icontains=identifier,
+            name__icontains=name,
+            owner__id__contains=owner
+        )
+        queryset = queryset.intersection(queryset1)
+
+        serializer = self.serializer_class(self.paginate_queryset(queryset), many=True, context={
+            "request": request
+        })
+
+        return self.get_paginated_response(serializer.data)
+
+    @action(detail=True, methods=['PATCH'], url_path='public', permission_classes=[IsAdminUser])
+    def patch_public(self, request: Request, **_) -> Response:
+        docker_image = self.get_object()
+        serializer = DockerImageSerializer(docker_image, data=request.data, partial=True, context={"request": request})
+
+        if serializer.is_valid():
+            serializer.save()
+
+        return Response(serializer.data)
 
     # TODO: Maybe not necessary
     # https://www.django-rest-framework.org/api-guide/permissions/#overview-of-access-restriction-methods
diff --git a/frontend/src/assets/lang/app/en.json b/frontend/src/assets/lang/app/en.json
index c68e83c5..133d76cd 100644
--- a/frontend/src/assets/lang/app/en.json
+++ b/frontend/src/assets/lang/app/en.json
@@ -231,6 +231,9 @@
     "admin": {
         "title": "Admin",
         "keyword": "Keyword",
+        "id": "ID",
+        "list": "List",
+        "add": "Add",
         "search": {
             "search": "Search",
             "general": "Search by general keyword"
@@ -240,7 +243,6 @@
         "save": "Save",
         "users": {
             "title": "Users",
-            "id": "ID",
             "username": "Username",
             "email": "Email",
             "roles": "Roles"
@@ -257,7 +259,18 @@
         "teachers": {
             "title": "Teachers"
         },
-        "teacher": "Teacher"
+        "teacher": "Teacher",
+        "catalog": "Catalog",
+        "docker_images": {
+            "title": "Docker Images",
+            "name_input": "Name of docker image",
+            "name": "Name",
+            "owner": "Owner ID",
+            "public": "Public",
+            "private": "Private"
+        },
+        "none_found": "No matching data.",
+        "loading": "Loading data. Please wait."
     },
     "primevue": {
         "startsWith": "Starts with",
diff --git a/frontend/src/assets/lang/app/nl.json b/frontend/src/assets/lang/app/nl.json
index a7ff3470..7c8bbc24 100644
--- a/frontend/src/assets/lang/app/nl.json
+++ b/frontend/src/assets/lang/app/nl.json
@@ -231,6 +231,9 @@
     "admin": {
         "title": "Beheerder",
         "keyword": "Trefwoord",
+        "id": "ID",
+        "list": "Lijst",
+        "add": "Voeg toe",
         "search": {
             "search": "Zoeken",
             "general": "Zoek op algemeen trefwoord"
@@ -240,7 +243,6 @@
         "save": "Sla op",
         "users": {
             "title": "Gebruikers",
-            "id": "ID",
             "username": "Gebruikersnaam",
             "email": "E-mail",
             "roles": "Functies"
@@ -257,7 +259,18 @@
         "teachers": {
             "title": "Proffen"
         },
-        "teacher": "Prof"
+        "teacher": "Prof",
+        "catalog": "Catalogus",
+        "docker_images": {
+            "title": "Docker Images",
+            "name_input": "Naam van docker image",
+            "name": "Naam",
+            "owner": "Eigenaar ID",
+            "public": "Publiek",
+            "private": "Privaat"
+        },
+        "none_found": "Geen overeenkomende data gevonden.",
+        "loading": "Aan het laden. Wacht een momentje aub."
     },
     "primevue": {
         "accept": "Ja",
diff --git a/frontend/src/components/admin/LazyDataTable.vue b/frontend/src/components/admin/LazyDataTable.vue
new file mode 100644
index 00000000..1781d9b7
--- /dev/null
+++ b/frontend/src/components/admin/LazyDataTable.vue
@@ -0,0 +1,110 @@
+<script setup lang="ts">
+import DataTable, { type DataTableSelectAllChangeEvent } from 'primevue/datatable';
+import { onMounted, watch, ref, defineExpose, toRef } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { type PaginatorResponse } from '@/types/filter/Paginator.ts';
+import { usePaginator } from '@/composables/filters/paginator.ts';
+import { type Filter } from '@/types/filter/Filter.ts';
+import Column from 'primevue/column';
+
+/* Properties */
+const props = defineProps<{
+    pagination: PaginatorResponse<any> | null;
+    entities: any[] | null; // list containing all the entities displayed by data table after executing get method
+    get: () => Promise<void>; // get method for backend
+    search: (filters: Filter, page: number, pageSize: number) => Promise<void>;
+    filter: Filter;
+    onFilter: (callback: () => Promise<void>, debounce?: number | undefined, immediate?: boolean | undefined) => void;
+}>();
+
+/* Injections */
+const { t } = useI18n();
+const { page, first, pageSize, onPaginate, resetPagination } = usePaginator();
+
+const loading = ref(false);
+const selected = ref<any[] | null>(null);
+const selectAll = ref(false);
+
+onMounted(async () => {
+    onPaginate(fetch);
+
+    watch(
+        props.filter,
+        () => {
+            loading.value = true;
+        },
+        { deep: true },
+    );
+    props.onFilter(fetch);
+
+    props.onFilter(
+        async () => {
+            await resetPagination([toRef(props.pagination)]);
+        },
+        0,
+        false,
+    );
+});
+
+const fetch = async (): Promise<void> => {
+    loading.value = true;
+    props.search(props.filter, page.value, pageSize.value).then(() => {
+        loading.value = false;
+    });
+};
+const onSelectAllChange = (event: DataTableSelectAllChangeEvent): void => {
+    selectAll.value = event.checked;
+
+    if (selectAll.value) {
+        props.get().then(() => {
+            selectAll.value = true;
+            selected.value = props.entities;
+        });
+    } else {
+        selectAll.value = false;
+        selected.value = [];
+    }
+};
+const onRowSelect = (): void => {
+    selectAll.value = selected.value?.length === (props.pagination?.count ?? 0);
+};
+const onRowUnselect = (): void => {
+    selectAll.value = false;
+};
+
+defineExpose({ fetch });
+</script>
+
+<template>
+    <div class="card p-fluid">
+        <DataTable
+            :value="pagination?.results"
+            lazy
+            paginator
+            v-model:first="first"
+            :rows="pageSize"
+            dataKey="id"
+            auto-layout
+            :totalRecords="pagination?.count"
+            :loading="loading"
+            @page="loading = true"
+            filterDisplay="row"
+            v-model:selection="selected"
+            :selectAll="selectAll"
+            @select-all-change="onSelectAllChange"
+            @row-select="onRowSelect"
+            @row-unselect="onRowUnselect"
+            tableStyle="min-width: 75rem"
+        >
+            <template #header>
+                <slot name="header" />
+            </template>
+            <template #empty>{{ t('admin.none_found') }}</template>
+            <template #loading>{{ t('admin.loading') }}</template>
+            <Column selectionMode="multiple" headerStyle="width: 3rem" class="justify-content-center"></Column>
+            <slot />
+        </DataTable>
+    </div>
+</template>
+
+<style scoped lang="scss"></style>
diff --git a/frontend/src/components/layout/admin/AdminSidebar.vue b/frontend/src/components/layout/admin/AdminSidebar.vue
index 127e8186..729936f9 100644
--- a/frontend/src/components/layout/admin/AdminSidebar.vue
+++ b/frontend/src/components/layout/admin/AdminSidebar.vue
@@ -15,6 +15,15 @@ const items = ref([
             },
         ],
     },
+    {
+        label: 'admin.catalog',
+        items: [
+            {
+                label: 'admin.docker_images.title',
+                route: 'admin-dockerImages',
+            },
+        ],
+    },
 ]);
 </script>
 
diff --git a/frontend/src/composables/services/docker.service.ts b/frontend/src/composables/services/docker.service.ts
new file mode 100644
index 00000000..69b25946
--- /dev/null
+++ b/frontend/src/composables/services/docker.service.ts
@@ -0,0 +1,64 @@
+import { DockerImage } from '@/types/DockerImage.ts';
+import { Response } from '@/types/Response.ts';
+import { endpoints } from '@/config/endpoints.ts';
+import { type Ref, ref } from 'vue';
+import { type Filter } from '@/types/filter/Filter.ts';
+import { create, getList, getPaginatedList, patch } from '@/composables/services/helpers.ts';
+import { type PaginatorResponse } from '@/types/filter/Paginator.ts';
+
+interface DockerImagesState {
+    pagination: Ref<PaginatorResponse<DockerImage> | null>;
+    dockerImages: Ref<DockerImage[] | null>;
+    response: Ref<Response | null>;
+    getDockerImages: () => Promise<void>;
+    searchDockerImages: (filters: Filter, page: number, pageSize: number) => Promise<void>;
+    patchDockerImage: (dockerData: DockerImage) => Promise<void>;
+    createDockerImage: (dockerData: DockerImage, file: File) => Promise<void>;
+}
+
+export function useDockerImages(): DockerImagesState {
+    const pagination = ref<PaginatorResponse<DockerImage> | null>(null);
+    const dockerImages = ref<DockerImage[] | null>(null);
+    const response = ref<Response | null>(null);
+
+    async function getDockerImages(): Promise<void> {
+        const endpoint = endpoints.dockerImages.index;
+        await getList<DockerImage>(endpoint, dockerImages, DockerImage.fromJSON);
+    }
+
+    async function searchDockerImages(filters: Filter, page: number, pageSize: number): Promise<void> {
+        const endpoint = endpoints.dockerImages.search;
+        await getPaginatedList<DockerImage>(endpoint, filters, page, pageSize, pagination, DockerImage.fromJSON);
+    }
+
+    async function patchDockerImage(dockerData: DockerImage): Promise<void> {
+        const endpoint = endpoints.dockerImages.patch.replace('{id}', dockerData.id);
+        await patch(endpoint, { public: dockerData.public }, response);
+    }
+
+    async function createDockerImage(dockerData: DockerImage, file: File): Promise<void> {
+        const endpoint = endpoints.dockerImages.index;
+        await create<Response>(
+            endpoint,
+            {
+                file,
+                name: dockerData.name,
+                public: dockerData.public,
+            },
+            response,
+            Response.fromJSON,
+            'multipart/form-data',
+        );
+    }
+
+    return {
+        pagination,
+        dockerImages,
+        response,
+
+        getDockerImages,
+        searchDockerImages,
+        patchDockerImage,
+        createDockerImage,
+    };
+}
diff --git a/frontend/src/config/endpoints.ts b/frontend/src/config/endpoints.ts
index ad8e8435..4ab98e01 100644
--- a/frontend/src/config/endpoints.ts
+++ b/frontend/src/config/endpoints.ts
@@ -18,6 +18,11 @@ export const endpoints = {
         byTeacher: '/api/teachers/{teacherId}/courses/',
         byAssistant: '/api/assistants/{assistantId}/courses/',
     },
+    dockerImages: {
+        index: '/api/docker-images/',
+        search: '/api/docker-images/search/',
+        patch: '/api/docker-images/{id}/public/',
+    },
     students: {
         index: '/api/students/',
         retrieve: '/api/students/{id}/',
diff --git a/frontend/src/router/router.ts b/frontend/src/router/router.ts
index 13db7315..68955715 100644
--- a/frontend/src/router/router.ts
+++ b/frontend/src/router/router.ts
@@ -21,6 +21,7 @@ import SubmissionView from '@/views/submissions/SubmissionView.vue';
 import AdminView from '@/views/admin/AdminView.vue';
 import UsersView from '@/views/admin/UsersView.vue';
 import ProjectsView from '@/views/projects/ProjectsView.vue';
+import DockerImagesView from '@/views/admin/DockerImagesView.vue';
 
 const routes: RouteRecordRaw[] = [
     // Authentication
@@ -151,6 +152,7 @@ const routes: RouteRecordRaw[] = [
         children: [
             { path: '', component: AdminView, name: 'admin' },
             { path: 'users', component: UsersView, name: 'admin-users' },
+            { path: 'docker-images', component: DockerImagesView, name: 'admin-dockerImages' },
         ],
     },
 
diff --git a/frontend/src/types/DockerImage.ts b/frontend/src/types/DockerImage.ts
new file mode 100644
index 00000000..9d82a49f
--- /dev/null
+++ b/frontend/src/types/DockerImage.ts
@@ -0,0 +1,20 @@
+export class DockerImage {
+    public public: boolean;
+    constructor(
+        public id: string,
+        public name: string,
+        public file: string, // in the form of a uri
+        public publicStatus: boolean,
+        public owner: string,
+    ) {
+        this.public = publicStatus;
+    }
+
+    static fromJSON(dockerData: DockerImage): DockerImage {
+        return new DockerImage(dockerData.id, dockerData.name, dockerData.file, dockerData.public, dockerData.owner);
+    }
+
+    static blankDockerImage(): DockerImage {
+        return new DockerImage('', '', '', false, '');
+    }
+}
diff --git a/frontend/src/types/filter/Filter.ts b/frontend/src/types/filter/Filter.ts
index 10358711..59236fd3 100644
--- a/frontend/src/types/filter/Filter.ts
+++ b/frontend/src/types/filter/Filter.ts
@@ -14,6 +14,12 @@ export type CourseFilter = {
     years: string[];
 } & Filter;
 
+export type DockerImageFilter = {
+    id: string;
+    name: string;
+    owner: string;
+} & Filter;
+
 export interface Filter {
     search: string;
     [key: string]: string | string[];
@@ -69,6 +75,20 @@ export function getCourseFilters(query: LocationQuery): CourseFilter {
     return filters;
 }
 
+/**
+ * Get the docker image filters from the query.
+ *
+ * @param query
+ */
+export function getDockerImageFilters(query: LocationQuery): DockerImageFilter {
+    return {
+        search: query.search?.toString() ?? '',
+        id: query.id?.toString() ?? '',
+        name: query.id?.toString() ?? '',
+        owner: query.id?.toString() ?? '',
+    };
+}
+
 /**
  * Get the query list.
  *
diff --git a/frontend/src/views/admin/DockerImagesView.vue b/frontend/src/views/admin/DockerImagesView.vue
new file mode 100644
index 00000000..f1aa089e
--- /dev/null
+++ b/frontend/src/views/admin/DockerImagesView.vue
@@ -0,0 +1,158 @@
+<script setup lang="ts">
+import FileUpload, { type FileUploadUploaderEvent } from 'primevue/fileupload';
+import InputText from 'primevue/inputtext';
+import InputSwitch from 'primevue/inputswitch';
+import ToggleButton from 'primevue/togglebutton';
+import SelectButton from 'primevue/selectbutton';
+import Dialog from 'primevue/dialog';
+import Button from 'primevue/button';
+import AdminLayout from '@/components/layout/admin/AdminLayout.vue';
+import Title from '@/components/layout/Title.vue';
+import Body from '@/components/layout/Body.vue';
+import LazyDataTable from '@/components/admin/LazyDataTable.vue';
+import { useDockerImages } from '@/composables/services/docker.service.ts';
+import { useFilter } from '@/composables/filters/filter.ts';
+import { useI18n } from 'vue-i18n';
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { DockerImage } from '@/types/DockerImage.ts';
+import { getDockerImageFilters } from '@/types/filter/Filter.ts';
+import InputIcon from 'primevue/inputicon';
+import Column from 'primevue/column';
+import IconField from 'primevue/iconfield';
+
+/* Injection */
+const { t } = useI18n();
+const { query } = useRoute();
+const { pagination, dockerImages, getDockerImages, searchDockerImages, patchDockerImage, createDockerImage } =
+    useDockerImages();
+const { filter, onFilter } = useFilter(getDockerImageFilters(query));
+
+const dataTable = ref();
+
+const editItem = ref<DockerImage>(DockerImage.blankDockerImage());
+const addItem = ref<DockerImage>(DockerImage.blankDockerImage());
+
+const selectOptions = ref(['admin.list', 'admin.add']);
+const selected = ref<string>(t(selectOptions.value[0]));
+
+const columns = ref([
+    { field: 'id', header: 'admin.id' },
+    { field: 'name', header: 'admin.docker_images.name' },
+    { field: 'owner', header: 'admin.docker_images.owner' },
+]);
+// const publicOptions = ref<Array<{ value: any; label: string }>>([
+//     { value: true, label: 'public' },
+//     { value: false, label: 'private' },
+// ]);
+const showSafetyGuard = ref<boolean>(false);
+
+const toggleSafetyGuard = (data: DockerImage): void => {
+    editItem.value.public = !data.public;
+    editItem.value.id = data.id;
+    showSafetyGuard.value = true;
+};
+const changePublicStatus = async (dockerData: DockerImage): Promise<void> => {
+    showSafetyGuard.value = false;
+    await patchDockerImage(dockerData);
+    await dataTable.value.fetch();
+};
+const upload = async (event: FileUploadUploaderEvent): Promise<void> => {
+    const files: File[] = event.files as File[];
+    await createDockerImage(addItem.value, files[0]);
+    addItem.value.name = '';
+};
+</script>
+
+<template>
+    <AdminLayout>
+        <Title>
+            <div class="gap-3 mb-3">{{ t('admin.docker_images.title') }}</div>
+        </Title>
+        <Body>
+            <SelectButton class="mb-3 gap-3" v-model="selected" :options="selectOptions.map(t)" />
+            <div v-if="selected === t(selectOptions[0])">
+                <LazyDataTable
+                    :pagination="pagination"
+                    :entities="dockerImages"
+                    :get="getDockerImages"
+                    :search="searchDockerImages"
+                    :filter="filter"
+                    :on-filter="onFilter"
+                    ref="dataTable"
+                >
+                    <template #header>
+                        <div class="flex justify-content-end">
+                            <IconField iconPosition="left">
+                                <InputIcon>
+                                    <i class="pi pi-search" />
+                                </InputIcon>
+                                <InputText v-model="filter['search']" :placeholder="t('admin.search.general')" />
+                            </IconField>
+                        </div>
+                    </template>
+                    <Column
+                        v-for="column in columns"
+                        :key="column.field"
+                        :field="column.field"
+                        :header="t(column.header)"
+                        :show-filter-menu="false"
+                        :style="{ maxWidth: '3rem' }"
+                    >
+                        <template #filter>
+                            <IconField iconPosition="left" class="flex align-items-center">
+                                <InputIcon>
+                                    <i class="pi pi-search flex justify-content-center" />
+                                </InputIcon>
+                                <InputText v-model="filter[column.field]" :placeholder="t('admin.search.search')" />
+                            </IconField>
+                        </template>
+                    </Column>
+                    <Column
+                        key="public"
+                        field="public"
+                        :header="t('admin.docker_images.public')"
+                        :style="{ maxWidth: '3rem' }"
+                    >
+                        <template #body="{ data }">
+                            <ToggleButton
+                                class="mb-3 gap-3"
+                                :model-value="data.public"
+                                @click="() => toggleSafetyGuard(data)"
+                                :on-label="t('admin.docker_images.public')"
+                                :off-label="t('admin.docker_images.private')"
+                            />
+                        </template>
+                    </Column>
+                </LazyDataTable>
+            </div>
+            <div v-else>
+                <InputText
+                    class="mb-3 gap-3"
+                    v-model:model-value="addItem.name"
+                    :placeholder="t('admin.docker_images.name_input')"
+                />
+                <div v-if="addItem.name.length > 0">
+                    <div class="flex align-items-center mb-3 gap-3">
+                        <label class="font-semibold w-12rem">{{ t('admin.docker_images.public') }}</label>
+                        <InputSwitch v-model:model-value="addItem.public" />
+                    </div>
+                    <FileUpload class="mb-3 gap-3" :custom-upload="true" @uploader="upload" :file-limit="1">
+                        <template #empty>
+                            <strong>No file selected.</strong>
+                        </template>
+                    </FileUpload>
+                </div>
+            </div>
+        </Body>
+    </AdminLayout>
+    <Dialog v-model:visible="showSafetyGuard" :style="{ width: '15rem' }">
+        <h3>Are you sure?</h3>
+        <div class="flex justify-content-between">
+            <Button label="No" @click="showSafetyGuard = false" />
+            <Button label="Yes" @click="() => changePublicStatus(editItem)" />
+        </div>
+    </Dialog>
+</template>
+
+<style scoped lang="scss"></style>
diff --git a/frontend/src/views/admin/UsersView.vue b/frontend/src/views/admin/UsersView.vue
index 0d97de75..8118dd25 100644
--- a/frontend/src/views/admin/UsersView.vue
+++ b/frontend/src/views/admin/UsersView.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import DataTable, { type DataTableSelectAllChangeEvent } from 'primevue/datatable';
 import Column from 'primevue/column';
 import Dialog from 'primevue/dialog';
 import InputSwitch from 'primevue/inputswitch';
@@ -11,14 +10,14 @@ import MultiSelect from 'primevue/multiselect';
 import AdminLayout from '@/components/layout/admin/AdminLayout.vue';
 import Title from '@/components/layout/Title.vue';
 import Body from '@/components/layout/Body.vue';
-import { ref, onMounted, watch, computed } from 'vue';
+import LazyDataTable from '@/components/admin/LazyDataTable.vue';
+import { ref, onMounted, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useUser } from '@/composables/services/users.service.ts';
 import { useStudents } from '@/composables/services/student.service.ts';
 import { useAssistant } from '@/composables/services/assistant.service.ts';
 import { useTeacher } from '@/composables/services/teacher.service.ts';
 import { useFilter } from '@/composables/filters/filter.ts';
-import { usePaginator } from '@/composables/filters/paginator.ts';
 
 import { roles, type Role, User } from '@/types/users/User.ts';
 import { getUserFilters } from '@/types/filter/Filter.ts';
@@ -32,31 +31,10 @@ const { createStudent, deleteStudent } = useStudents();
 const { createAssistant, deleteAssistant } = useAssistant();
 const { createTeacher, deleteTeacher } = useTeacher();
 const { filter, onFilter } = useFilter(getUserFilters(query));
-const { page, first, pageSize, onPaginate, resetPagination } = usePaginator();
 
 onMounted(async () => {
     fillCreators();
     fillDestroyers();
-
-    onPaginate(fetchUsers);
-
-    watch(
-        filter,
-        () => {
-            loading.value = true;
-        },
-        { deep: true },
-    );
-
-    onFilter(fetchUsers);
-
-    onFilter(
-        async () => {
-            await resetPagination([pagination]);
-        },
-        0,
-        false,
-    );
 });
 
 const creators = ref<Record<Role, (arg: any) => Promise<void>>>({});
@@ -64,14 +42,12 @@ const createFunctions = ref<Array<(arg: any) => Promise<void>>>([createStudent,
 const destroyers = ref<Record<Role, (arg: any) => Promise<void>>>({});
 const destroyFunctions = ref<Array<(arg: any) => Promise<void>>>([deleteStudent, deleteAssistant, deleteTeacher]);
 
-const loading = ref(false);
-const selectedUsers = ref();
-const selectAll = ref(false);
+const dataTable = ref();
 const editItem = ref<User>(User.blankUser());
 const popupEdit = ref<boolean>(false);
 
 const columns = ref([
-    { field: 'id', header: 'admin.users.id' },
+    { field: 'id', header: 'admin.id' },
     { field: 'username', header: 'admin.users.username' },
     { field: 'email', header: 'admin.users.email' },
     { field: 'roles', header: 'admin.users.roles' },
@@ -93,32 +69,6 @@ const fillDestroyers = (): void => {
         destroyers.value[role] = destroyFunctions.value[i - 1];
     }
 };
-const fetchUsers = async (): Promise<void> => {
-    loading.value = true;
-    await searchUsers(filter.value, page.value, pageSize.value).then(() => {
-        loading.value = false;
-    });
-};
-const onSelectAllChange = (event: DataTableSelectAllChangeEvent): void => {
-    selectAll.value = event.checked;
-
-    if (selectAll.value) {
-        getUsers().then(() => {
-            selectAll.value = true;
-            selectedUsers.value = users.value;
-        });
-    } else {
-        selectAll.value = false;
-        selectedUsers.value = [];
-    }
-};
-const onRowSelect = (): void => {
-    selectAll.value = selectedUsers.value.length === (pagination.value?.count ?? 0);
-};
-const onRowUnselect = (): void => {
-    selectAll.value = false;
-};
-
 const showPopup = (data: any): void => {
     editItem.value = JSON.parse(JSON.stringify(data)); // I do this to get a deep copy of the role array
     popupEdit.value = true;
@@ -169,7 +119,8 @@ const saveItem = async (): Promise<void> => {
         // update admin status
         await toggleAdmin(editItem.value.id, editItem.value.is_staff);
         // update locally
-        await fetchUsers();
+        console.log(dataTable.value);
+        await dataTable.value.fetch();
     } else {
         // raise error TODO
     }
@@ -184,24 +135,14 @@ const saveItem = async (): Promise<void> => {
         </Title>
         <Body>
             <div class="card p-fluid">
-                <DataTable
-                    :value="pagination?.results"
-                    lazy
-                    paginator
-                    v-model:first="first"
-                    :rows="pageSize"
-                    dataKey="id"
-                    auto-layout
-                    :totalRecords="pagination?.count"
-                    :loading="loading"
-                    @page="loading = true"
-                    filterDisplay="row"
-                    v-model:selection="selectedUsers"
-                    :selectAll="selectAll"
-                    @select-all-change="onSelectAllChange"
-                    @row-select="onRowSelect"
-                    @row-unselect="onRowUnselect"
-                    tableStyle="min-width: 75rem"
+                <LazyDataTable
+                    :pagination="pagination"
+                    :entities="users"
+                    :get="getUsers"
+                    :search="searchUsers"
+                    :filter="filter"
+                    :on-filter="onFilter"
+                    ref="dataTable"
                 >
                     <template #header>
                         <div class="flex justify-content-end">
@@ -215,7 +156,6 @@ const saveItem = async (): Promise<void> => {
                     </template>
                     <template #empty>No matching data.</template>
                     <template #loading>Loading data. Please wait.</template>
-                    <Column selectionMode="multiple" headerStyle="width: 3rem" class="justify-content-center"></Column>
                     <Column
                         v-for="column in columns"
                         :key="column.field"
@@ -252,7 +192,7 @@ const saveItem = async (): Promise<void> => {
                             <Button @click="() => showPopup(data)">{{ t('admin.edit') }}</Button>
                         </template>
                     </Column>
-                </DataTable>
+                </LazyDataTable>
             </div>
         </Body>
     </AdminLayout>