diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 55cb279..5382e76 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -6,11 +6,6 @@ on:
     paths:
       - "Dockerfile"
       - "src/**"
-  pull_request:
-    branches: [ "main" ]
-    paths:
-      - "Dockerfile"
-      - "src/**"
   workflow_dispatch:
 
 jobs:
diff --git a/src/DevOpsQuickScan.BlazorApp/Components/Pages/Home.razor b/src/DevOpsQuickScan.BlazorApp/Components/Pages/Home.razor
index 2811469..a628a7c 100644
--- a/src/DevOpsQuickScan.BlazorApp/Components/Pages/Home.razor
+++ b/src/DevOpsQuickScan.BlazorApp/Components/Pages/Home.razor
@@ -65,6 +65,6 @@
         };
     }
     
-    private void AnswerQuestion(QuestionAnsweredDto answer) =>
+    private void AnswerQuestion(QuestionAnswered answer) =>
         Session.AnswerQuestion(_participantId!, answer.QuestionId, answer.AnswerId);
 }
diff --git a/src/DevOpsQuickScan.BlazorApp/Components/Partials/QuestionComponent.razor b/src/DevOpsQuickScan.BlazorApp/Components/Partials/QuestionComponent.razor
index d19f6c6..9d86f04 100644
--- a/src/DevOpsQuickScan.BlazorApp/Components/Partials/QuestionComponent.razor
+++ b/src/DevOpsQuickScan.BlazorApp/Components/Partials/QuestionComponent.razor
@@ -55,7 +55,7 @@
 
     [Parameter] public required Question Question { get; set; }
     [Parameter] public int? PreviousAnswer { get; set; }
-    [Parameter] public required EventCallback<QuestionAnsweredDto> OnQuestionAnswered { get; set; }
+    [Parameter] public required EventCallback<QuestionAnswered> OnQuestionAnswered { get; set; }
 
     private int? _selectedAnswer;
     private bool _hasSubmitted = false;
@@ -75,7 +75,7 @@
 
     private async Task SubmitAnswer()
     {
-        await OnQuestionAnswered.InvokeAsync(new QuestionAnsweredDto(Question.Id, _selectedAnswer!.Value));
+        await OnQuestionAnswered.InvokeAsync(new QuestionAnswered(Question.Id, _selectedAnswer!.Value));
         _hasSubmitted = true;
     }
 
diff --git a/src/DevOpsQuickScan.Core/QuestionAnswered.cs b/src/DevOpsQuickScan.Core/QuestionAnswered.cs
new file mode 100644
index 0000000..8267b5c
--- /dev/null
+++ b/src/DevOpsQuickScan.Core/QuestionAnswered.cs
@@ -0,0 +1,3 @@
+namespace DevOpsQuickScan.Core;
+
+public record QuestionAnswered(int QuestionId, int AnswerId);
\ No newline at end of file
diff --git a/src/DevOpsQuickScan.Core/QuestionAnsweredDto.cs b/src/DevOpsQuickScan.Core/QuestionAnsweredDto.cs
deleted file mode 100644
index 2bee4ae..0000000
--- a/src/DevOpsQuickScan.Core/QuestionAnsweredDto.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace DevOpsQuickScan.Core;
-
-public record QuestionAnsweredDto(int QuestionId, int AnswerId);
\ No newline at end of file
diff --git a/tests/DevOpsQuickScan.Tests/BlazorApp/Partials/QuestionComponentTests.cs b/tests/DevOpsQuickScan.Tests/BlazorApp/Partials/QuestionComponentTests.cs
index 469138d..3de8715 100644
--- a/tests/DevOpsQuickScan.Tests/BlazorApp/Partials/QuestionComponentTests.cs
+++ b/tests/DevOpsQuickScan.Tests/BlazorApp/Partials/QuestionComponentTests.cs
@@ -34,7 +34,7 @@ public void RendersQuestionCorrectly()
             parameters.Add(p => p.Question, question);
             parameters.Add(p => p.PreviousAnswer, null);
             parameters.Add(p => p.OnQuestionAnswered,
-                EventCallback.Factory.Create<QuestionAnsweredDto>(this, _ => { }));
+                EventCallback.Factory.Create<QuestionAnswered>(this, _ => { }));
         });
 
         // ASSERT
@@ -77,7 +77,7 @@ public void RenderingWithoutQuestionWillNotCrash()
             parameters.Add(p => p.Question, null);
             parameters.Add(p => p.PreviousAnswer, null);
             parameters.Add(p => p.OnQuestionAnswered,
-                EventCallback.Factory.Create<QuestionAnsweredDto>(this, _ => { }));
+                EventCallback.Factory.Create<QuestionAnswered>(this, _ => { }));
         });
 
         // ASSERT
@@ -108,7 +108,7 @@ public void SelectingAnswerEnablesButton()
             parameters.Add(p => p.Question, question);
             parameters.Add(p => p.PreviousAnswer, null);
             parameters.Add(p => p.OnQuestionAnswered,
-                EventCallback.Factory.Create<QuestionAnsweredDto>(this, _ => { }));
+                EventCallback.Factory.Create<QuestionAnswered>(this, _ => { }));
         });
 
         // ACT
@@ -138,14 +138,14 @@ public void CanSubmitAnswer()
             ]
         };
 
-        QuestionAnsweredDto? answeredQuestion = null;
+        QuestionAnswered? answeredQuestion = null;
 
         var component = RenderComponent<QuestionComponent>(parameters =>
         {
             parameters.Add(p => p.Question, question);
             parameters.Add(p => p.PreviousAnswer, null);
             parameters.Add(p => p.OnQuestionAnswered,
-                EventCallback.Factory.Create<QuestionAnsweredDto>(this, result => { answeredQuestion = result; }));
+                EventCallback.Factory.Create<QuestionAnswered>(this, result => { answeredQuestion = result; }));
         });
         var input = component.Find("input[value='3']");
         var button = component.Find("button");
@@ -188,7 +188,7 @@ public void LoadingWithSelectionSelectsAnswerAndRemovesButton()
             parameters.Add(p => p.Question, question);
             parameters.Add(p => p.PreviousAnswer, 3);
             parameters.Add(p => p.OnQuestionAnswered,
-                EventCallback.Factory.Create<QuestionAnsweredDto>(this, result => { }));
+                EventCallback.Factory.Create<QuestionAnswered>(this, result => { }));
         });
 
         // ASSERT