cite figure source at end of caption and not mid-sentence for chapter2

thesis/content/20_state.tex

@@ -38,10 +38,10 @@ This chapter introduces the relevant technologies and concepts for this thesis.
 
 \section{\glsentrylong{qdp}}
 
-\begin{figure}[ht]
+\begin{figure}[h!tb]
     \centering
     \includegraphics[width=0.7\textwidth]{images/simple-query-graphic.pdf}
-    \caption{Illustration of a simple query in (a) and the corresponding pipeline in (b). Taken from \cite[Fig. 1]{dimes-prefetching}.}
+    \caption{Illustration of a simple query in (a) and the corresponding pipeline in (b). \cite[Fig. 1]{dimes-prefetching}}
     \label{fig:qdp-simple-query}
 \end{figure}
 
@@ -55,10 +55,10 @@ Introduced with the \(4^{th}\) generation of Intel Xeon Scalable Processors, the
 
 \subsection{Hardware Architecture} \label{subsection:dsa-hwarch}
 
-\begin{figure}[ht]
+\begin{figure}[h!tb]
     \centering
     \includegraphics[width=0.9\textwidth]{images/block-dsa-hwarch.pdf}
-    \caption{\glsentrylong{dsa} Internal Architecture \cite[Fig. 1 (a)]{intel:analysis}. Shows the components that the chip is made up of, how they are connected and which outside components the \glsentryshort{dsa} communicates with.}
+    \caption{\glsentrylong{dsa} Internal Architecture. Shows the components that the chip is made up of, how they are connected and which outside components the \glsentryshort{dsa} communicates with.  \cite[Fig. 1 (a)]{intel:analysis}}
     \label{fig:dsa-internal-block}
 \end{figure}
 
@@ -91,7 +91,7 @@ Ordering of operations is only guaranteed for a configuration with one \gls{dsa:
 \begin{figure}[h!tb]
     \centering
     \includegraphics[width=0.5\textwidth]{images/block-dsa-swarch.pdf}
-    \caption{\glsentrylong{dsa} Software View \cite[Fig. 1 (b)]{intel:analysis}. Illustrating the software stack and internal interactions from user applications, through the driver to the portal for work submission.}
+    \caption{\glsentrylong{dsa} Software View. Illustrating the software stack and internal interactions from user applications, through the driver to the portal for work submission. \cite[Fig. 1 (b)]{intel:analysis}}
     \label{fig:dsa-software-arch}
 \end{figure}