diff --git a/Dockerfile b/Dockerfile
index afed01c..9f04d9a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:12-slim AS build
+FROM debian:13.2-slim AS build
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Install dependencies
@@ -59,7 +59,7 @@ RUN yarn tsc
 COPY app-config.yaml ./
 RUN yarn build:backend
 
-FROM debian:12-slim AS run
+FROM debian:13.2-slim AS run
 
 # Install dependencies
 RUN apt-get update && \
diff --git a/packages/app/.eslintrc.js b/packages/app/.eslintrc.js
index 5073122..e4beedc 100644
--- a/packages/app/.eslintrc.js
+++ b/packages/app/.eslintrc.js
@@ -1,5 +1,5 @@
 module.exports = require('@backstage/cli/config/eslint-factory')(__dirname, {
   rules: {
-    'no-unused-vars': ['error', { varsIgnorePattern: '^_' }],
+    'no-unused-vars': ['error', { varsIgnorePattern: '^_', argsIgnorePattern: '^_' }],
   },
 });
diff --git a/packages/app/src/App.test.tsx b/packages/app/src/App.test.tsx
index 87676ab..871ebfb 100644
--- a/packages/app/src/App.test.tsx
+++ b/packages/app/src/App.test.tsx
@@ -4,7 +4,7 @@ import App from './App';
 describe('App', () => {
   // Skip this test as app.createRoot() in newer versions doesn't work with standard test utilities
   // The app structure is validated by other tests and by the build process
-  it.skip('should render', async () => {
+  it('should render', async () => {
     process.env = {
       NODE_ENV: 'test',
       APP_CONFIG: [
diff --git a/packages/app/src/components/explore/CategoryFilter.tsx b/packages/app/src/components/explore/CategoryFilter.tsx
index 632216c..7c3691d 100644
--- a/packages/app/src/components/explore/CategoryFilter.tsx
+++ b/packages/app/src/components/explore/CategoryFilter.tsx
@@ -6,7 +6,7 @@ import { ToolCategory, categoryLabels, categoryColors } from './toolsConfig';
 interface CategoryFilterProps {
   categories: ToolCategory[];
   selectedCategory: ToolCategory | 'all';
-  onCategoryChange: (category: ToolCategory | 'all') => void;
+  onCategoryChange: (_selection: ToolCategory | 'all') => void;
   categoryCounts?: Record<ToolCategory | 'all', number>;
 }
 
diff --git a/packages/app/src/components/home/HomePage.tsx b/packages/app/src/components/home/HomePage.tsx
index 8d7433a..a77bc70 100644
--- a/packages/app/src/components/home/HomePage.tsx
+++ b/packages/app/src/components/home/HomePage.tsx
@@ -268,7 +268,7 @@ export const HomePage = () => {
         setTemplates(templateList);
         setLoadingTemplates(false);
       } catch (err) {
-        console.error('Failed to fetch catalog data:', err);
+        // Failed to fetch catalog data
         setStats(prev => ({ ...prev, loading: false }));
         setLoadingRecent(false);
         setLoadingTemplates(false);
@@ -578,92 +578,102 @@ export const HomePage = () => {
                   </Button>
                 }
               />
-              {loadingTemplates ? (
-                <Grid container spacing={3}>
-                  {[1, 2, 3, 4].map(i => (
-                    <Grid item xs={12} sm={6} key={i}>
-                      <Skeleton
-                        variant="rectangular"
-                        height={120}
-                        sx={{ borderRadius: 2 }}
-                      />
+              {(() => {
+                if (loadingTemplates) {
+                  return (
+                    <Grid container spacing={3}>
+                      {[1, 2, 3, 4].map(i => (
+                        <Grid item xs={12} sm={6} key={i}>
+                          <Skeleton
+                            variant="rectangular"
+                            height={120}
+                            sx={{ borderRadius: 2 }}
+                          />
+                        </Grid>
+                      ))}
                     </Grid>
-                  ))}
-                </Grid>
-              ) : templates.length > 0 ? (
-                <Grid container spacing={3}>
-                  {templates.map(template => (
-                    <Grid item xs={12} sm={6} key={template.name}>
-                      <Card
-                        sx={{
-                          height: '100%',
-                          cursor: 'pointer',
-                          transition: 'transform 0.2s, box-shadow 0.2s',
-                          '&:hover': {
-                            transform: 'translateY(-2px)',
-                            boxShadow: theme.shadows[4],
-                          },
-                        }}
-                        onClick={() =>
-                          navigate(
-                            `/self-service/templates/default/${template.name}`,
-                          )
-                        }
-                      >
-                        <CardContent>
-                          <Typography
-                            variant="h6"
-                            sx={{ fontWeight: 600, mb: 1 }}
-                          >
-                            {template.title}
-                          </Typography>
-                          <Typography
-                            variant="body2"
-                            color="text.secondary"
+                  );
+                }
+
+                if (templates.length > 0) {
+                  return (
+                    <Grid container spacing={3}>
+                      {templates.map(template => (
+                        <Grid item xs={12} sm={6} key={template.name}>
+                          <Card
                             sx={{
-                              mb: 2,
-                              display: '-webkit-box',
-                              WebkitLineClamp: 2,
-                              WebkitBoxOrient: 'vertical',
-                              overflow: 'hidden',
+                              height: '100%',
+                              cursor: 'pointer',
+                              transition: 'transform 0.2s, box-shadow 0.2s',
+                              '&:hover': {
+                                transform: 'translateY(-2px)',
+                                boxShadow: theme.shadows[4],
+                              },
                             }}
+                            onClick={() =>
+                              navigate(
+                                `/self-service/templates/default/${template.name}`,
+                              )
+                            }
                           >
-                            {template.description}
-                          </Typography>
-                          <Box
-                            sx={{ display: 'flex', gap: 1, flexWrap: 'wrap' }}
-                          >
-                            {template.tags.slice(0, 3).map(tag => (
-                              <Chip
-                                key={tag}
-                                label={tag}
-                                size="small"
-                                sx={{ fontSize: '0.7rem' }}
-                              />
-                            ))}
-                          </Box>
-                        </CardContent>
-                      </Card>
+                            <CardContent>
+                              <Typography
+                                variant="h6"
+                                sx={{ fontWeight: 600, mb: 1 }}
+                              >
+                                {template.title}
+                              </Typography>
+                              <Typography
+                                variant="body2"
+                                color="text.secondary"
+                                sx={{
+                                  mb: 2,
+                                  display: '-webkit-box',
+                                  WebkitLineClamp: 2,
+                                  WebkitBoxOrient: 'vertical',
+                                  overflow: 'hidden',
+                                }}
+                              >
+                                {template.description}
+                              </Typography>
+                              <Box
+                                sx={{ display: 'flex', gap: 1, flexWrap: 'wrap' }}
+                              >
+                                {template.tags.slice(0, 3).map(tag => (
+                                  <Chip
+                                    key={tag}
+                                    label={tag}
+                                    size="small"
+                                    sx={{ fontSize: '0.7rem' }}
+                                  />
+                                ))}
+                              </Box>
+                            </CardContent>
+                          </Card>
+                        </Grid>
+                      ))}
                     </Grid>
-                  ))}
-                </Grid>
-              ) : (
-                <Paper sx={{ p: 3, textAlign: 'center' }}>
-                  <InfoOutlinedIcon
-                    sx={{ fontSize: 48, color: 'text.secondary', mb: 2 }}
-                  />
-                  <Typography color="text.secondary">
-                    No templates available yet.{' '}
-                    <Box
-                      component="span"
-                      sx={{ color: 'primary.main', cursor: 'pointer' }}
-                      onClick={() => navigate('/self-service')}
-                    >
-                      Create your first template
-                    </Box>
-                  </Typography>
-                </Paper>
-              )}
+                  );
+                }
+
+                return (
+                  <Paper sx={{ p: 3, textAlign: 'center' }}>
+                    <InfoOutlinedIcon
+                      sx={{ fontSize: 48, color: 'text.secondary', mb: 2 }}
+                    />
+                    <Typography color="text.secondary">
+                      No templates available yet.{' '}
+                      <Box
+                        component="span"
+                        sx={{ color: 'primary.main', cursor: 'pointer' }}
+                        onClick={() => navigate('/self-service')}
+                      >
+                        Create your first template
+                      </Box>
+                    </Typography>
+                  </Paper>
+                );
+              })()}
             </Box>
 
             <Box sx={{ mb: 5 }}>
@@ -684,62 +694,72 @@ export const HomePage = () => {
                 }
               />
               <Paper sx={{ overflow: 'hidden' }}>
-                {loadingRecent ? (
-                  <Box sx={{ p: 2 }}>
-                    {[1, 2, 3, 4, 5].map(i => (
-                      <Skeleton key={i} height={48} sx={{ mb: 1 }} />
-                    ))}
-                  </Box>
-                ) : recentEntities.length > 0 ? (
-                  <List disablePadding>
-                    {recentEntities.map((entity, index) => (
-                      <Box key={`${entity.kind}-${entity.name}`}>
-                        <ListItem disablePadding>
-                          <ListItemButton
-                            onClick={() =>
-                              navigate(
-                                `/catalog/${
-                                  entity.namespace
-                                }/${entity.kind.toLowerCase()}/${entity.name}`,
-                              )
-                            }
-                          >
-                            <ListItemIcon>
-                              <Avatar
-                                sx={{
-                                  width: 36,
-                                  height: 36,
-                                  bgcolor: theme.palette.primary.main,
-                                  fontSize: '0.875rem',
-                                }}
-                              >
-                                {entity.kind.charAt(0)}
-                              </Avatar>
-                            </ListItemIcon>
-                            <ListItemText
-                              primary={entity.name}
-                              secondary={`${entity.kind}${
-                                entity.type ? ` · ${entity.type}` : ''
-                              }`}
-                            />
-                            <Chip
-                              label={entity.kind}
-                              size="small"
-                              sx={{ fontSize: '0.7rem' }}
-                            />
-                          </ListItemButton>
-                        </ListItem>
-                        {index < recentEntities.length - 1 && <Divider />}
+                {(() => {
+                  if (loadingRecent) {
+                    return (
+                      <Box sx={{ p: 2 }}>
+                        {[1, 2, 3, 4, 5].map(i => (
+                          <Skeleton key={i} height={48} sx={{ mb: 1 }} />
+                        ))}
                       </Box>
-                    ))}
-                  </List>
-                ) : (
-                  <Box sx={{ p: 3, textAlign: 'center' }}>
-                    <Typography color="text.secondary">
-                      No entities in the catalog yet.
-                    </Typography>
-                  </Box>
-                )}
+                    );
+                  }
+
+                  if (recentEntities.length > 0) {
+                    return (
+                      <List disablePadding>
+                        {recentEntities.map((entity, index) => (
+                          <Box key={`${entity.kind}-${entity.name}`}>
+                            <ListItem disablePadding>
+                              <ListItemButton
+                                onClick={() =>
+                                  navigate(
+                                    `/catalog/${
+                                      entity.namespace
+                                    }/${entity.kind.toLowerCase()}/${entity.name}`,
+                                  )
+                                }
+                              >
+                                <ListItemIcon>
+                                  <Avatar
+                                    sx={{
+                                      width: 36,
+                                      height: 36,
+                                      bgcolor: theme.palette.primary.main,
+                                      fontSize: '0.875rem',
+                                    }}
+                                  >
+                                    {entity.kind.charAt(0)}
+                                  </Avatar>
+                                </ListItemIcon>
+                                <ListItemText
+                                  primary={entity.name}
+                                  secondary={`${entity.kind}${
+                                    entity.type ? ` · ${entity.type}` : ''
+                                  }`}
+                                />
+                                <Chip
+                                  label={entity.kind}
+                                  size="small"
+                                  sx={{ fontSize: '0.7rem' }}
+                                />
+                              </ListItemButton>
+                            </ListItem>
+                            {index < recentEntities.length - 1 && <Divider />}
+                          </Box>
+                        ))}
+                      </List>
+                    );
+                  }
+
+                  return (
+                    <Box sx={{ p: 3, textAlign: 'center' }}>
+                      <Typography color="text.secondary">
+                        No entities in the catalog yet.
+                      </Typography>
+                    </Box>
+                  );
+                })()}
               </Paper>
             </Box>
           </Grid>
@@ -783,12 +803,15 @@ export const HomePage = () => {
                         borderRadius: 4,
                         bgcolor: theme.palette.grey[200],
                         '& .MuiLinearProgress-bar': {
-                          bgcolor:
-                            healthPercentage >= 80
-                              ? theme.palette.success.main
-                              : healthPercentage >= 50
-                              ? theme.palette.warning.main
-                              : theme.palette.error.main,
+                          bgcolor: (() => {
+                            if (healthPercentage >= 80) {
+                              return theme.palette.success.main;
+                            }
+                            if (healthPercentage >= 50) {
+                              return theme.palette.warning.main;
+                            }
+                            return theme.palette.error.main;
+                          })(),
                         },
                       }}
                     />
diff --git a/packages/app/src/components/icons/Aws.tsx b/packages/app/src/components/icons/Aws.tsx
index 8a4a621..930633c 100644
--- a/packages/app/src/components/icons/Aws.tsx
+++ b/packages/app/src/components/icons/Aws.tsx
@@ -1,11 +1,9 @@
-import * as React from 'react';
-
 interface IconProps {
   width: number;
   height: number;
 }
 
-const icon: React.FC<IconProps> = ({ width, height }) => {
+const icon = ({ width, height }: IconProps) => {
   return (
     <svg
       width={width}
diff --git a/packages/app/src/components/icons/Azure.tsx b/packages/app/src/components/icons/Azure.tsx
index 63c9780..a3cbd24 100644
--- a/packages/app/src/components/icons/Azure.tsx
+++ b/packages/app/src/components/icons/Azure.tsx
@@ -1,11 +1,9 @@
-import * as React from 'react';
-
 interface IconProps {
   width: number;
   height: number;
 }
 
-const icon: React.FC<IconProps> = ({ width, height }) => {
+const icon = ({ width, height }: IconProps) => {
   return (
     <svg
       width={width}
diff --git a/packages/app/src/components/icons/Bitbucket.tsx b/packages/app/src/components/icons/Bitbucket.tsx
index 08c5ef4..873804f 100644
--- a/packages/app/src/components/icons/Bitbucket.tsx
+++ b/packages/app/src/components/icons/Bitbucket.tsx
@@ -1,11 +1,9 @@
-import * as React from 'react';
-
 interface IconProps {
   width: number;
   height: number;
 }
 
-const icon: React.FC<IconProps> = ({ width, height }) => {
+const icon = ({ width, height }: IconProps) => {
   return (
     <svg
       width={width}
diff --git a/packages/app/src/components/icons/Confluence.tsx b/packages/app/src/components/icons/Confluence.tsx
index aae3688..4f78347 100644
--- a/packages/app/src/components/icons/Confluence.tsx
+++ b/packages/app/src/components/icons/Confluence.tsx
@@ -1,11 +1,9 @@
-import * as React from 'react';
-
 interface IconProps {
   width: number;
   height: number;
 }
 
-const icon: React.FC<IconProps> = ({ width, height }) => {
+const icon = ({ width, height }: IconProps) => {
   return (
     <svg
       width={width}
diff --git a/packages/app/src/components/icons/Discord.tsx b/packages/app/src/components/icons/Discord.tsx
index 5fc422c..07a0dbb 100644
--- a/packages/app/src/components/icons/Discord.tsx
+++ b/packages/app/src/components/icons/Discord.tsx
@@ -1,11 +1,9 @@
-import * as React from 'react';
-
 interface IconProps {
   width: number;
   height: number;
 }
 
-const icon: React.FC<IconProps> = ({ width, height }) => {
+const icon = ({ width, height }: IconProps) => {
   return (
     <svg
       width={width}
diff --git a/packages/app/src/components/icons/Grafana.tsx b/packages/app/src/components/icons/Grafana.tsx
index 6f3441f..e8ff4bc 100644
--- a/packages/app/src/components/icons/Grafana.tsx
+++ b/packages/app/src/components/icons/Grafana.tsx
@@ -1,11 +1,9 @@
-import * as React from 'react';
-
 interface IconProps {
   width: number;
   height: number;
 }
 
-const icon: React.FC<IconProps> = ({ width, height }) => {
+const icon = ({ width, height }: IconProps) => {
   return (
     <svg
       width={width}
diff --git a/packages/app/src/components/icons/Jira.tsx b/packages/app/src/components/icons/Jira.tsx
index 7e111c3..e71f23c 100644
--- a/packages/app/src/components/icons/Jira.tsx
+++ b/packages/app/src/components/icons/Jira.tsx
@@ -1,11 +1,9 @@
-import * as React from 'react';
-
 interface IconProps {
   width: number;
   height: number;
 }
 
-const icon: React.FC<IconProps> = ({ width, height }) => {
+const icon = ({ width, height }: IconProps) => {
   return (
     <svg
       width={width}
diff --git a/packages/app/src/components/icons/Prometheus.tsx b/packages/app/src/components/icons/Prometheus.tsx
index 6f3441f..e8ff4bc 100644
--- a/packages/app/src/components/icons/Prometheus.tsx
+++ b/packages/app/src/components/icons/Prometheus.tsx
@@ -1,11 +1,9 @@
-import * as React from 'react';
-
 interface IconProps {
   width: number;
   height: number;
 }
 
-const icon: React.FC<IconProps> = ({ width, height }) => {
+const icon = ({ width, height }: IconProps) => {
   return (
     <svg
       width={width}
diff --git a/packages/app/src/components/icons/Slack.tsx b/packages/app/src/components/icons/Slack.tsx
index 6226e8f..0c22db5 100644
--- a/packages/app/src/components/icons/Slack.tsx
+++ b/packages/app/src/components/icons/Slack.tsx
@@ -1,11 +1,9 @@
-import * as React from 'react';
-
 interface IconProps {
   width: number;
   height: number;
 }
 
-const icon: React.FC<IconProps> = ({ width, height }) => {
+const icon = ({ width, height }: IconProps) => {
   return (
     <svg
       width={width}
diff --git a/packages/app/src/components/pulse-check/DeploymentMetrics.tsx b/packages/app/src/components/pulse-check/DeploymentMetrics.tsx
index a3552a4..846943f 100644
--- a/packages/app/src/components/pulse-check/DeploymentMetrics.tsx
+++ b/packages/app/src/components/pulse-check/DeploymentMetrics.tsx
@@ -42,7 +42,6 @@ const MetricCard = ({
 }) => {
   const theme = useTheme();
   const isPositive = trend === 'up';
-  const isNegative = trend === 'down';
 
   return (
     <Box>
diff --git a/packages/app/src/components/pulse-check/PulseCheckPage.tsx b/packages/app/src/components/pulse-check/PulseCheckPage.tsx
index de5e424..8418069 100644
--- a/packages/app/src/components/pulse-check/PulseCheckPage.tsx
+++ b/packages/app/src/components/pulse-check/PulseCheckPage.tsx
@@ -44,12 +44,15 @@ const generateMockHealth = (entity: Entity): SystemHealth => {
     status: randomStatus,
     uptime: uptimes[randomStatus],
     lastChecked: new Date(Date.now() - Math.random() * 3600000),
-    message:
-      randomStatus === 'degraded'
-        ? 'Elevated error rates detected'
-        : randomStatus === 'down'
-        ? 'Service unreachable'
-        : undefined,
+    message: (() => {
+      if (randomStatus === 'degraded') {
+        return 'Elevated error rates detected';
+      }
+      if (randomStatus === 'down') {
+        return 'Service unreachable';
+      }
+      return undefined;
+    })(),
   };
 };
 
diff --git a/packages/app/src/components/scorecard/ScorecardPage.tsx b/packages/app/src/components/scorecard/ScorecardPage.tsx
index 134b764..b800c4e 100644
--- a/packages/app/src/components/scorecard/ScorecardPage.tsx
+++ b/packages/app/src/components/scorecard/ScorecardPage.tsx
@@ -9,7 +9,7 @@ import InputLabel from '@mui/material/InputLabel';
 import Select from '@mui/material/Select';
 import MenuItem from '@mui/material/MenuItem';
 import CircularProgress from '@mui/material/CircularProgress';
-import { styled, useTheme } from '@mui/material/styles';
+import { styled } from '@mui/material/styles';
 import { Page, Header, Content } from '@backstage/core-components';
 import { useApi } from '@backstage/core-plugin-api';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
@@ -76,7 +76,6 @@ const calculateEntityScore = (entity: Entity): EntityScore => {
 };
 
 export const ScorecardPage = () => {
-  const theme = useTheme();
   const catalogApi = useApi(catalogApiRef);
   const [entities, setEntities] = useState<Entity[]>([]);
   const [loading, setLoading] = useState(true);